Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
- Timestamp:
- 2017-08-22T22:26:32+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
r11686 r12620 38 38 import org.openstreetmap.josm.io.OsmTransferException; 39 39 import org.openstreetmap.josm.tools.ImageProvider; 40 import org.openstreetmap.josm.tools.Logging; 40 41 41 42 /** … … 200 201 } 201 202 monitor.appendLogMessage(msg); 202 Main.warn(msg);203 Logging.warn(msg); 203 204 processedPrimitives.addAll(writer.getProcessedPrimitives()); 204 205 processedPrimitives.add(p); … … 224 225 SwingUtilities.invokeAndWait(r); 225 226 } catch (InterruptedException e) { 226 Main.trace(e);227 Logging.trace(e); 227 228 lastException = e; 228 229 Thread.currentThread().interrupt(); 229 230 } catch (InvocationTargetException e) { 230 Main.trace(e);231 Logging.trace(e); 231 232 lastException = new OsmTransferException(e.getCause()); 232 233 } … … 249 250 break; 250 251 } catch (OsmTransferCanceledException e) { 251 Main.error(e);252 Logging.error(e); 252 253 uploadCanceled = true; 253 254 break uploadloop; … … 292 293 } catch (OsmTransferException e) { 293 294 if (uploadCanceled) { 294 Main.info(tr("Ignoring caught exception because upload is canceled. Exception is: {0}", e.toString()));295 Logging.info(tr("Ignoring caught exception because upload is canceled. Exception is: {0}", e.toString())); 295 296 } else { 296 297 lastException = e;
Note:
See TracChangeset
for help on using the changeset viewer.