Changeset 10234 in josm for trunk

Timestamp:

2016-05-17T00:43:47+02:00 (9 years ago)

Author:

Don-vip

Message:

findbugs - DB_DUPLICATE_SWITCH_CLAUSES + REC_CATCH_EXCEPTION + UC_USELESS_CONDITION + OS_OPEN_STREAM_EXCEPTION_PATH + ICAST_INTEGER_MULTIPLY_CAST_TO_LONG

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (2 diffs)
• actions/UploadSelectionAction.java (modified) (2 diffs)
• data/validation/tests/PowerLines.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (2 diffs)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)
• gui/io/DownloadFileTask.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• gui/layer/markerlayer/ButtonMarker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -42 +42 @@
  * @author imi
  */
-public class AboutAction extends JosmAction {
+public final class AboutAction extends JosmAction {
 
     /**
@@ -130 +130 @@
             displayErrorMessage(ta, tr("Failed to locate resource ''{0}''.", filePath));
         } else {
-            try {
-                BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+            try (InputStreamReader reader = new InputStreamReader(is, "UTF-8");
+                 BufferedReader br = new BufferedReader(reader)) {
                 String line;
                 while ((line = br.readLine()) != null) {
                     ta.append(line+'\n');
                 }
-                br.close();
             } catch (IOException e) {
                 Main.warn(e);

trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

@@ -341 +341 @@
                         // our local dataset includes a deleted parent of a primitive we want
                         // to delete. Include this parent in the collection of uploaded primitives
-                        //
                         if (myDeletedParent != null && myDeletedParent.isDeleted()) {
                             if (!toUpload.contains(myDeletedParent)) {
@@ -352 +351 @@
                     }
                 }
-            } catch (Exception e) {
+            } catch (OsmTransferException e) {
                 if (canceled)
                     // ignore exception

trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

@@ -206 +206 @@
     }
 
-    protected class PowerLineError extends TestError {
+    protected static class PowerLineError extends TestError {
         private final Way line;
 

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

@@ -1118 +1118 @@
      */
     public final WaySegment getNearestWaySegment(Point p, Predicate<OsmPrimitive> predicate, boolean useSelected) {
-        WaySegment wayseg = null, ntsel = null;
+        WaySegment wayseg = null;
+        WaySegment ntsel = null;
 
         for (List<WaySegment> wslist : getNearestWaySegmentsImpl(p, predicate).values()) {
@@ -1153 +1154 @@
      */
     public final WaySegment getNearestWaySegment(Point p, Predicate<OsmPrimitive> predicate,
-            boolean useSelected,  Collection<OsmPrimitive> preferredRefs) {
-        WaySegment wayseg = null, ntsel = null, ntref = null;
-        if (preferredRefs != null && preferredRefs.isEmpty()) preferredRefs = null;
+            boolean useSelected, Collection<OsmPrimitive> preferredRefs) {
+        WaySegment wayseg = null;
+        WaySegment ntsel = null;
+        WaySegment ntref = null;
+        if (preferredRefs != null && preferredRefs.isEmpty())
+            preferredRefs = null;
 
         searchLoop: for (List<WaySegment> wslist : getNearestWaySegmentsImpl(p, predicate).values()) {

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -973 +973 @@
                 switch (col) {
                 case 0: return layers.get(row) == getActiveLayer();
-                case 1: return layers.get(row);
-                case 2: return layers.get(row);
+                case 1:
+                case 2:
                 case 3: return layers.get(row);
-                default: throw new RuntimeException();
+                default: // Do nothing
                 }
             }

trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

@@ -119 +119 @@
                 byte[] buffer = new byte[32768];
                 int count = 0;
-                long p1 = 0, p2 = 0;
+                long p1 = 0;
+                long p2;
                 for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
                     out.write(buffer, 0, read);
                     count += read;
                     if (canceled) break;
-                    p2 = 100 * count / size;
+                    p2 = 100L * count / size;
                     if (p2 != p1) {
                         progressMonitor.setTicks((int) p2);

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -912 +912 @@
                     lblSeconds.setText(tr("Seconds: {0}", Offset.milliseconds(100L * sldSeconds.getValue()).formatOffset()));
 
-                    delta = Offset.milliseconds(100 * sldSeconds.getValue()
+                    delta = Offset.milliseconds(100L * sldSeconds.getValue()
                             + 1000L * 60 * sldMinutes.getValue()
                             + 1000L * 60 * 60 * 24 * dayOffset);

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java

@@ -66 +66 @@
 
         String labelText = getText();
-        if ((labelText != null) && showTextOrIcon && Main.pref.getBoolean("marker.buttonlabels", true)) {
+        if (labelText != null && Main.pref.getBoolean("marker.buttonlabels", true)) {
             g.drawString(labelText, screen.x+4, screen.y+2);
         }