Changeset 16625 in josm for trunk/src/org/openstreetmap/josm/gui/MapStatus.java

Timestamp:

2020-06-14T14:55:20+02:00 (4 years ago)

Author:

simon04

Message:

see #19334 - ​https://errorprone.info/bugpattern/UnusedVariable

File:

• trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) (3 diffs)

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

@@ -317 +317 @@
                 }
 
-                // This try/catch is a hack to stop the flooding bug reports about this.
-                // The exception needed to handle with in the first place, means that this
-                // access to the data need to be restarted, if the main thread modifies the data.
-                DataSet ds = null;
                 // The popup != null check is required because a left-click produces several events as well,
                 // which would make this variable true. Of course we only want the popup to show
@@ -328 +324 @@
                 boolean middleMouseDown = (ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0;
 
-                ds = mv.getLayerManager().getActiveDataSet();
+                DataSet ds = mv.getLayerManager().getActiveDataSet();
                 if (ds != null) {
                     // This is not perfect, if current dataset was changed during execution, the lock would be useless
@@ -340 +336 @@
                     }
                 }
+                // This try/catch is a hack to stop the flooding bug reports about this.
+                // The exception needed to handle with in the first place, means that this
+                // access to the data need to be restarted, if the main thread modifies the data.
                 try {
                     // Set the text label in the bottom status bar