Changeset 16625 in josm

Timestamp:

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

Author:

simon04

Message:

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

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MapStatus.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (modified) (1 diff)

trunk/build.xml

@@ -302 +302 @@
             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
-            <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:BadImport:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF"/>
+            <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:BadImport:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <classpath>

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

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java

@@ -22 +22 @@
      */
     public MemberTableColumnModel(AutoCompletionManager autoCompletionManager, Relation relation) {
-        TableColumn col = null;
+        TableColumn col;
 
         // column 0 - the member role

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java

@@ -146 +146 @@
     public static GpxImporterData loadLayers(final GpxData data, final boolean parsedProperly,
             final String gpxLayerName, String markerLayerName) {
-        GpxLayer gpxLayer = null;
         MarkerLayer markerLayer = null;
-        gpxLayer = new GpxLayer(data, gpxLayerName, data.storageFile != null);
+        GpxLayer gpxLayer = new GpxLayer(data, gpxLayerName, data.storageFile != null);
         if (Config.getPref().getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
             markerLayer = new MarkerLayer(data, markerLayerName, data.storageFile, gpxLayer);

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -285 +285 @@
         msg.add(scrollPane, GBC.eol().fill(GBC.BOTH));
 
-        int v = 1;
         // build dialog
         ExtendedDialog ed = new ExtendedDialog(MainApplication.getMainFrame(),
@@ -313 +312 @@
         ed.showDialog();
         dateFilter.saveInPrefs();
-        v = ed.getValue();
+        int v = ed.getValue();
         // cancel for unknown buttons and copy back original settings
         if (v != 2 && v != 3) {

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -376 +376 @@
     }
 
-    @SuppressWarnings("PMD.UnusedFormalParameter")
+    @SuppressWarnings({"PMD.UnusedFormalParameter", "UnusedVariable"})
     private static boolean isRemoveColor(ColorEntry ce) {
         return false;