Changeset 11537 in josm

Timestamp:

2017-02-04T15:31:22+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib:CCNE_COMPARE_CLASS_EQUALS_NAME - Correctness - Method compares class name instead of comparing class

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java

@@ -158 +158 @@
 
     /**
-     * <p>Replies true, if {@code Renderer} is already a registered map renderer
-     * class.</p>
+     * <p>Replies true, if {@code Renderer} is already a registered map renderer class.</p>
      *
      * @param renderer the map renderer class. Must not be null.
-     * @return true, if {@code Renderer} is already a registered map renderer
-     * class
+     * @return true, if {@code Renderer} is already a registered map renderer class
      * @throws IllegalArgumentException if {@code renderer} is null
      */
@@ -169 +167 @@
         CheckParameterUtil.ensureParameterNotNull(renderer);
         for (Descriptor d: descriptors) {
-            if (d.getRenderer().getName().equals(renderer.getName())) return true;
+            if (d.getRenderer().equals(renderer)) return true;
         }
         return false;
@@ -210 +208 @@
         while (it.hasNext()) {
             Descriptor d = it.next();
-            if (d.getRenderer().getName().equals(renderer.getName())) {
+            if (d.getRenderer().equals(renderer)) {
                 it.remove();
                 break;
             }
         }
-        if (activeRenderer != null && activeRenderer.getName().equals(renderer.getName())) {
+        if (activeRenderer != null && activeRenderer.equals(renderer)) {
             activateDefault();
         }
@@ -288 +286 @@
 
     /**
-     * <p>Replies true, if currently the wireframe map renderer is active. Otherwise,
-     * false.</p>
+     * <p>Replies true, if currently the wireframe map renderer is active. Otherwise, false.</p>
      *
      * <p>There is a specific method for {@link WireframeMapRenderer} for legacy support.
@@ -296 +293 @@
      * (menu entries, etc.) which toggle between these two renderers only.</p>
      *
-     * @return true, if currently the wireframe map renderer is active. Otherwise,
-     * false
+     * @return true, if currently the wireframe map renderer is active. Otherwise, false
      */
     public boolean isWireframeMapRendererActive() {
-        return activeRenderer != null && activeRenderer.getName().equals(WireframeMapRenderer.class.getName());
+        return WireframeMapRenderer.class.equals(activeRenderer);
     }
 }