Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/actions/upload

Timestamp:

2017-08-24T00:15:51+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

Location:

trunk/src/org/openstreetmap/josm/actions/upload

Files:

• UploadNotesTask.java (modified) (2 diffs)
• ValidateUploadHook.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.NoteData;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -123 +124 @@
                 StringBuilder sb = new StringBuilder();
                 for (Map.Entry<Note, Exception> entry : failedNotes.entrySet()) {
-                    sb.append(tr("Note {0} failed: {1}", entry.getKey().getId(), entry.getValue().getMessage()));
-                    sb.append('\n');
+                    sb.append(tr("Note {0} failed: {1}", entry.getKey().getId(), entry.getValue().getMessage()))
+                      .append('\n');
                 }
                 Logging.error("Notes failed to upload: " + sb.toString());
-                JOptionPane.showMessageDialog(Main.map, sb.toString(), tr("Notes failed to upload"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(MainApplication.getMap(), sb.toString(),
+                        tr("Notes failed to upload"), JOptionPane.ERROR_MESSAGE);
                 ExceptionDialogUtil.explainException(failedNotes.values().iterator().next());
             }

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.validation.util.AggregatePrimitivesVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -77 +79 @@
             editLayer.validationErrors.addAll(errors);
         }
-        if (Main.map != null) {
-            Main.map.validatorDialog.tree.setErrors(errors);
+        MapFrame map = MainApplication.getMap();
+        if (map != null) {
+            map.validatorDialog.tree.setErrors(errors);
         }
         if (errors.isEmpty())
@@ -148 +151 @@
             OsmValidator.initializeTests();
             OsmValidator.initializeErrorLayer();
-            Main.map.validatorDialog.unfurlDialog();
+            MainApplication.getMap().validatorDialog.unfurlDialog();
             Main.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
             return false;