Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java
r13215 r13219 17 17 import org.openstreetmap.josm.gui.io.AsynchronousUploadPrimitivesTask; 18 18 import org.openstreetmap.josm.gui.util.GuiHelper; 19 import org.openstreetmap.josm.tools.Logging; 19 20 20 21 /** … … 426 427 activeLayerChangeListeners.clear(); 427 428 layerAvailabilityListeners.clear(); 428 } else if (!GraphicsEnvironment.isHeadless()) { 429 GuiHelper.runInEDT(() -> JOptionPane.showMessageDialog(MainApplication.parent, 430 tr("A background upload is already in progress. Cannot reset state until the upload is finished."))); 429 } else { 430 String msg = tr("A background upload is already in progress. Cannot reset state until the upload is finished."); 431 Logging.warn(msg); 432 if (!GraphicsEnvironment.isHeadless()) { 433 GuiHelper.runInEDT(() -> JOptionPane.showMessageDialog(MainApplication.parent, msg)); 434 } 431 435 } 432 436 } -
trunk/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java
r13133 r13219 2 2 package org.openstreetmap.josm.gui.io; 3 3 4 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 4 import java.util.Optional; 5 6 import org.junit.After; 7 import org.junit.Assert; 8 import org.junit.Before; 5 9 import org.junit.Rule; 6 import org.junit.Before;7 import org.junit.After;8 10 import org.junit.Test; 9 import org.junit.Assert;10 11 import org.openstreetmap.josm.data.APIDataSet; 11 12 import org.openstreetmap.josm.data.coor.LatLon; … … 18 19 import org.openstreetmap.josm.testutils.JOSMTestRules; 19 20 20 import java.util.Optional;21 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 21 22 23 /** 24 * Unit tests of {@link AsynchronousUploadPrimitivesTask}. 25 */ 22 26 public class AsynchronousUploadPrimitivesTaskTest { 23 27 … … 62 66 strategy = null; 63 67 changeset = null; 68 uploadPrimitivesTask.cancel(); 64 69 uploadPrimitivesTask = null; 65 70 }
Note:
See TracChangeset
for help on using the changeset viewer.