Changeset 18174 in josm for trunk/src/org/openstreetmap

Timestamp:

2021-08-25T14:47:26+02:00 (3 years ago)

Author:

Don-vip

Message:

see #21240 - fix a few potential issues reported by Coverity

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• download/OverpassQueryWizardDialog.java (modified) (2 diffs)
• io/BasicUploadSettingsPanel.java (modified) (4 diffs)
• io/ChangesetManagementPanel.java (modified) (1 diff)

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

@@ -85 +85 @@
      */
     private void saveHistory() {
-        hcbSearchString.getModel().addTopElement(SearchSetting.fromString(hcbSearchString.getText()));
+        model.addTopElement(SearchSetting.fromString(hcbSearchString.getText()));
         prefs.save(OVERPASS_WIZARD_HISTORY);
     }
@@ -120 +120 @@
      */
     private boolean buildQueryAction() {
-        final String wizardSearchTerm = getSearchSettings().text;
-
-        Optional<String> q = this.tryParseSearchTerm(wizardSearchTerm);
+        Optional<String> q = tryParseSearchTerm(getSearchSettings().text);
         q.ifPresent(callbacks::submitWizardResult);
         return q.isPresent();

trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

@@ -320 +320 @@
     private void updateHistory(JTextField text) {
         String tag = (String) text.getDocument().getProperty("tag"); // tag is either "comment" or "source"
-        if (tag.equals("comment")) {
+        if ("comment".equals(tag)) {
             hcbUploadComment.addCurrentItemToHistory();
-        }
-        if (tag.equals("source")) {
+        } else if ("source".equals(tag)) {
             hcbUploadSource.addCurrentItemToHistory();
         }
@@ -382 +381 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        getDialog().setFocusToUploadButton();
+        setFocusToUploadButton();
     }
 
@@ -439 +438 @@
     public void keyTyped(KeyEvent e) {
         if (e.getKeyChar() == KeyEvent.VK_ENTER) {
-            getDialog().setFocusToUploadButton();
+            setFocusToUploadButton();
         }
     }
@@ -450 +449 @@
     public void keyReleased(KeyEvent e) {
     }
+
+    private void setFocusToUploadButton() {
+        Optional.ofNullable(getDialog()).ifPresent(UploadDialog::setFocusToUploadButton);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java

@@ -276 +276 @@
                 Changeset cs = (Changeset) cbOpenChangesets.getSelectedItem();
                 if (cs == null) return;
-                uploadDialogModel.putAll(getSelectedChangeset().getKeys());
+                uploadDialogModel.putAll(cs.getKeys());
                 firePropertyChange(SELECTED_CHANGESET_PROP, null, cs);
             }