Changeset 18805 in josm for trunk/src/org

Timestamp:

2023-08-14T17:34:52+02:00 (11 months ago)

Author:

taylor.smock

Message:

Fix #23117: NPE in PlaceSelection$NamedResultTableModel

This occurs when (a) search results are returned and then (b) the user searches
for more results, but nominatim returns garbage.

In addition, this also fixes some lint issues.

File:

• trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified) (6 diffs)

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

@@ -83 +83 @@
 
     private static class Server {
-        public final String name;
-        public final BiFunction<String, Collection<SearchResult>, URL> urlFunction;
-        public final String thirdcol;
-        public final String fourthcol;
+        final String name;
+        final BiFunction<String, Collection<SearchResult>, URL> urlFunction;
+        final String thirdcol;
+        final String fourthcol;
 
         Server(String n, BiFunction<String, Collection<SearchResult>, URL> u, String t, String f) {
@@ -133 +133 @@
     /**
      * Adds a new tab to the download dialog in JOSM.
-     *
+     * <p>
      * This method is, for all intents and purposes, the constructor for this class.
      */
@@ -192 +192 @@
         public void actionPerformed(ActionEvent e) {
             String searchExpression = cbSearchExpression.getText();
-            if (!isEnabled() || searchExpression.trim().isEmpty())
+            if (!isEnabled() || searchExpression.trim().isEmpty() || serverComboBox.getSelectedItem() == null)
                 return;
             cbSearchExpression.addCurrentItemToHistory();
@@ -298 +298 @@
                             JOptionPane.WARNING_MESSAGE, null
                     ));
+                    generateLastException(e);
                 }
             } catch (IOException | ParserConfigurationException e) {
-                if (!canceled) {
-                    OsmTransferException ex = new OsmTransferException(e);
-                    ex.setUrl(url.toString());
-                    lastException = ex;
-                }
+                generateLastException(e);
+            }
+        }
+
+        /**
+         * Generate an {@link OsmTransferException} that will be stored in {@link #lastException} if the operation is
+         * not cancelled.
+         * @param throwable The throwable to store as an {@link OsmTransferException}
+         */
+        private void generateLastException(Throwable throwable) {
+            if (!canceled) {
+                OsmTransferException ex = new OsmTransferException(throwable);
+                ex.setUrl(url.toString());
+                lastException = ex;
             }
         }
@@ -337 +347 @@
         }
 
+        /**
+         * Add data to the table
+         * @param data The data to add
+         */
         public void addData(List<SearchResult> data) {
             this.data.addAll(data);
@@ -403 +417 @@
         }
 
+        /**
+         * Set the header column values for the third and fourth columns
+         * @param third The new header for the third column
+         * @param fourth The new header for the fourth column
+         */
         public void setHeadlines(String third, String fourth) {
             col3.setHeaderValue(third);