Changeset 10965 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2016-09-05T23:50:16+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1226 - Method parameters, caught exceptions and foreach variables should not be reassigned

File:

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

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

@@ -442 +442 @@
     public static void addLayerChangeListener(LayerChangeListener listener, boolean initialFire) {
         if (listener != null) {
-            initialFire = initialFire && (Main.isDisplayingMapView() || fireDeprecatedListenerOnAdd);
-
-            LayerChangeAdapter adapter = new LayerChangeAdapter(listener, initialFire);
-            Main.getLayerManager().addLayerChangeListener(adapter, initialFire);
-            if (initialFire) {
+            boolean doInitialFire = initialFire && (Main.isDisplayingMapView() || fireDeprecatedListenerOnAdd);
+
+            LayerChangeAdapter adapter = new LayerChangeAdapter(listener, doInitialFire);
+            Main.getLayerManager().addLayerChangeListener(adapter, doInitialFire);
+            if (doInitialFire) {
                 Main.getLayerManager().addAndFireActiveLayerChangeListener(adapter);
             } else {