Changeset 6246 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

Timestamp:

2013-09-22T18:36:07+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - various bugfixes / violation fixes

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -204 +204 @@
             String cstring;
             if(count > 0 && !required) {
-                cstring = "0,"+String.valueOf(count);
+                cstring = "0,"+count;
             } else if(count > 0) {
                 cstring = String.valueOf(count);
@@ -1010 +1010 @@
         }
 
-        protected String getDisplayIfNull(String display) {
-            return display;
+        protected String getDisplayIfNull() {
+            return null;
         }
 
@@ -1020 +1020 @@
             String value = null;
             if (display == null) {
-                display = getDisplayIfNull(display);
+                display = getDisplayIfNull();
             }
 
@@ -1208 +1208 @@
 
         @Override
-        protected String getDisplayIfNull(String display) {
+        protected String getDisplayIfNull() {
             if (combo.isEditable())
                 return combo.getEditor().getItem().toString();
             else
-                return display;
-
+                return null;
         }
     }