Changeset 12578 in josm for trunk/src

Timestamp:

2017-08-06T22:38:35+02:00 (7 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OverpassDownloadAction.java (modified) (1 diff)
• actions/search/SearchAction.java (modified) (1 diff)
• gui/download/OverpassQueryList.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java

@@ -228 +228 @@
                     overpassQueryList.setVisible(false);
                     arrowButton.setDirection(BasicArrowButton.WEST);
-                    OVERPASS_QUERY_LIST_OPENED.put(false);
+                    OVERPASS_QUERY_LIST_OPENED.put(Boolean.FALSE);
                 } else {
                     overpassQueryList.setVisible(true);
                     arrowButton.setDirection(BasicArrowButton.EAST);
-                    OVERPASS_QUERY_LIST_OPENED.put(false);
+                    OVERPASS_QUERY_LIST_OPENED.put(Boolean.FALSE);
                 }
             });

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -1003 +1003 @@
     public static class SearchSettingsActionParameter extends ActionParameter<SearchSetting> {
 
+        /**
+         * Constructs a new {@code SearchSettingsActionParameter}.
+         * @param name parameter name (the key)
+         */
         public SearchSettingsActionParameter(String name) {
             super(name);

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

@@ -184 +184 @@
                 componentParent,
                 tr("Edit item"),
-                item.getKey(),
-                item.getQuery(),
-                new String[] {tr("Save")});
+                item,
+                tr("Save"));
         dialog.showDialog();
 
@@ -428 +427 @@
 
         EditItemDialog(Component parent, String title, String... buttonTexts) {
-            this(parent, title, "", "", buttonTexts);
+            this(parent, title, null, buttonTexts);
         }
 
@@ -434 +433 @@
                 Component parent,
                 String title,
-                String nameToEdit,
-                String queryToEdit,
+                SelectorItem itemToEdit,
                 String... buttonTexts) {
             super(parent, title, buttonTexts);
 
+            String nameToEdit = itemToEdit != null ? itemToEdit.getKey() : "";
+            String queryToEdit = itemToEdit != null ? itemToEdit.getQuery() : "";
             this.initialNameHash = nameToEdit.hashCode();