Changeset 18728 in josm for trunk/src

Timestamp:

2023-05-12T14:55:43+02:00 (12 months ago)

Author:

taylor.smock

Message:

Fix #21886: Download Dialog incorrectly reports note area rejection (patch by gaben, modified)

The modifications are as follows:

• SonarLint fixes
• Removal of unused code (see r16503)

File:

• trunk/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java

@@ -88 +88 @@
                 MainApplication.worker.submit(new PostDownloadHandler(task, future));
                 if (zoom) {
-                    tasks.add(new Pair<AbstractDownloadTask<?>, Future<?>>(task, future));
+                    tasks.add(new Pair<>(task, future));
                 }
             } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
@@ -212 +212 @@
 
             // size check depends on selected data source
-            checkboxChangeListener = e ->
-                    dialog.getSelectedDownloadArea().ifPresent(this::updateSizeCheck);
+            checkboxChangeListener = e -> {
+                rememberSettings();
+                dialog.getSelectedDownloadArea().ifPresent(OSMDownloadSourcePanel.this::boundingBoxChanged);
+            };
 
             downloadSourcesPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
@@ -281 +283 @@
             }
 
-            final Boolean slippyMapShowsDownloadBounds = settings.getSlippyMapBounds()
+            final boolean slippyMapShowsDownloadBounds = settings.getSlippyMapBounds()
                     .map(b -> b.intersects(settings.getDownloadBounds().get()))
                     .orElse(true);
@@ -325 +327 @@
         @Override
         public void boundingBoxChanged(Bounds bbox) {
-            updateSizeCheck(bbox);
-        }
-
-        @Override
-        public String getSimpleName() {
-            return SIMPLE_NAME;
-        }
-
-        private void updateSizeCheck(Bounds bbox) {
             if (bbox == null) {
                 sizeCheck.setText(tr("No area selected yet"));
@@ -341 +334 @@
 
             displaySizeCheckResult(DOWNLOAD_SOURCES.stream()
+                    .filter(IDownloadSourceType::isEnabled)
                     .anyMatch(type -> type.isDownloadAreaTooLarge(bbox)));
+        }
+
+        @Override
+        public String getSimpleName() {
+            return SIMPLE_NAME;
         }
 
@@ -355 +354 @@
     }
 
-    /**
-     * Encapsulates data that is required to download from the OSM server.
-     */
-    static class OSMDownloadData {
-
-        private final List<IDownloadSourceType> downloadPossibilities;
-
-        /**
-         * Constructs a new {@code OSMDownloadData}.
-         * @param downloadPossibilities A list of DataDownloadTypes (instantiated, with
-         *                              options set)
-         */
-        OSMDownloadData(List<IDownloadSourceType> downloadPossibilities) {
-            this.downloadPossibilities = downloadPossibilities;
-        }
-
-        /**
-         * Returns the download possibilities.
-         * @return A list of DataDownloadTypes (instantiated, with options set)
-         */
-        public List<IDownloadSourceType> getDownloadPossibilities() {
-            return downloadPossibilities;
-        }
-    }
-
     private static class OsmDataDownloadType implements IDownloadSourceType {
         static final BooleanProperty IS_ENABLED = new BooleanProperty("download.osm.data", true);
@@ -415 +389 @@
         public boolean isDownloadAreaTooLarge(Bounds bound) {
             // see max_request_area in
-            // https://github.com/openstreetmap/openstreetmap-website/blob/master/config/example.application.yml
+            // https://github.com/openstreetmap/openstreetmap-website/blob/master/config/settings.yml
             return bound.getArea() > Config.getPref().getDouble("osm-server.max-request-area", 0.25);
         }
@@ -493 +467 @@
         public boolean isDownloadAreaTooLarge(Bounds bound) {
             // see max_note_request_area in
-            // https://github.com/openstreetmap/openstreetmap-website/blob/master/config/example.application.yml
+            // https://github.com/openstreetmap/openstreetmap-website/blob/master/config/settings.yml
             return bound.getArea() > Config.getPref().getDouble("osm-server.max-request-area-notes", 25);
         }