Changeset 8855 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2015-10-10T21:01:42+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - Unused private method should be removed
sonar - Unused protected methods should be removed
sonar - Sections of code should not be "commented out"
sonar - Empty statements should be removed
sonar - squid:S1172 - Unused method parameters should be removed
sonar - squid:S1481 - Unused local variables should be removed

File:

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

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -442 +442 @@
     @Override
     public boolean isMergable(final Layer other) {
-        // isUploadDiscouraged commented to allow merging between normal layers and discouraged layers with a warning (see #7684)
-        return other instanceof OsmDataLayer; // && (isUploadDiscouraged() == ((OsmDataLayer)other).isUploadDiscouraged());
+        // allow merging between normal layers and discouraged layers with a warning (see #7684)
+        return other instanceof OsmDataLayer;
     }