Changeset 10106 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2016-04-03T16:22:18+02:00 (8 years ago)

Author:

Don-vip

Message:

fix coverity 1353523 + 1347995

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -230 +230 @@
 
     private final transient TaggingPresetHandler presetHandler = new TaggingPresetHandler() {
-        @Override public void updateTags(List<Tag> tags) {
+        @Override
+        public void updateTags(List<Tag> tags) {
             Command command = TaggingPreset.createCommand(getSelection(), tags);
-            if (command != null) Main.main.undoRedo.add(command);
-        }
-
-        @Override public Collection<OsmPrimitive> getSelection() {
-            if (Main.main == null) return null;
-            return Main.main.getInProgressSelection();
+            if (command != null) {
+                Main.main.undoRedo.add(command);
+            }
+        }
+
+        @Override
+        public Collection<OsmPrimitive> getSelection() {
+            return Main.main == null ? Collections.<OsmPrimitive>emptyList() : Main.main.getInProgressSelection();
         }
     };