Changeset 12865 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/ac

Timestamp:

2017-09-15T01:20:41+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11390 - SonarQube - squid:S3824 - "Map.get" and value test should be replaced with single method call

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -506 +506 @@
     }
 
-    private static void registerListeners(AutoCompletionManager autoCompletionManager) {
-        autoCompletionManager.ds.addDataSetListener(autoCompletionManager);
+    private AutoCompletionManager registerListeners() {
+        ds.addDataSetListener(this);
         MainApplication.getLayerManager().addLayerChangeListener(new LayerChangeListener() {
             @Override
             public void layerRemoving(LayerRemoveEvent e) {
                 if (e.getRemovedLayer() instanceof OsmDataLayer
-                        && ((OsmDataLayer) e.getRemovedLayer()).data == autoCompletionManager.ds) {
-                    INSTANCES.remove(autoCompletionManager.ds);
-                    autoCompletionManager.ds.removeDataSetListener(autoCompletionManager);
+                        && ((OsmDataLayer) e.getRemovedLayer()).data == ds) {
+                    INSTANCES.remove(ds);
+                    ds.removeDataSetListener(AutoCompletionManager.this);
                     MainApplication.getLayerManager().removeLayerChangeListener(this);
                 }
@@ -529 +529 @@
             }
         });
+        return this;
     }
 
@@ -538 +539 @@
      */
     public static AutoCompletionManager of(DataSet dataSet) {
-        AutoCompletionManager result = INSTANCES.get(dataSet);
-        if (result == null) {
-            result = new AutoCompletionManager(dataSet);
-            INSTANCES.put(dataSet, result);
-            registerListeners(result);
-        }
-        return result;
+        return INSTANCES.computeIfAbsent(dataSet, ds -> new AutoCompletionManager(ds).registerListeners());
     }
 }