Changeset 13941 in josm for trunk/src/org

Timestamp:

2018-06-17T14:23:33+02:00 (6 years ago)

Author:

Don-vip

Message:

sonar - fix recent violations

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (1 diff)
• gui/MainApplication.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• io/remotecontrol/handler/RequestHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -1350 +1350 @@
     public Collection<OsmPrimitive> getInProgressSelection() {
         DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) return null;
+        if (ds == null) return Collections.emptyList();
         if (getCurrentBaseNode() != null && !ds.selectionEmpty()) {
             Way continueFrom = getWayForNode(getCurrentBaseNode());

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -543 +543 @@
         } else {
             OsmData<?, ?, ?, ?> ds = layerManager.getActiveData();
-            if (ds == null) return null;
+            if (ds == null) return Collections.emptyList();
             return ds.getSelected();
         }

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

@@ -566 +566 @@
 
         // Ignore parameter as we do not want to operate always on real selection here, especially in draw mode
-        Collection<? extends IPrimitive> newSel = Optional.ofNullable(Main.main.getInProgressISelection()).orElseGet(Collections::emptyList);
+        Collection<? extends IPrimitive> newSel = Main.main.getInProgressISelection();
         String selectedTag;
         Relation selectedRelation = null;

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -309 +309 @@
 
     private boolean get(String key) {
-        return get(key, Boolean::parseBoolean, () -> false);
+        return get(key, Boolean::parseBoolean, () -> Boolean.FALSE);
     }