Changeset 10300 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

Timestamp:

2016-05-30T01:17:28+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - Performance - Method passes constant String of length 1 to character overridden method + add unit tests/javadoc

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -222 +222 @@
     @Override
     public String getToolTipText() {
-        return data.size()+" "+trn("marker", "markers", data.size());
+        return Integer.toString(data.size())+' '+trn("marker", "markers", data.size());
     }
 
     @Override
     public void mergeFrom(Layer from) {
-        MarkerLayer layer = (MarkerLayer) from;
-        data.addAll(layer.data);
-        Collections.sort(data, new Comparator<Marker>() {
-            @Override
-            public int compare(Marker o1, Marker o2) {
-                return Double.compare(o1.time, o2.time);
-            }
-        });
+        if (from instanceof MarkerLayer) {
+            data.addAll(((MarkerLayer) from).data);
+            Collections.sort(data, new Comparator<Marker>() {
+                @Override
+                public int compare(Marker o1, Marker o2) {
+                    return Double.compare(o1.time, o2.time);
+                }
+            });
+        }
     }