Changeset 12808 in josm for trunk/src/org

Timestamp:

2017-09-09T20:13:14+02:00 (7 years ago)

Author:

Don-vip

Message:

SpotBugs - fix some warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainApplication.java (modified) (2 diffs)
• gui/widgets/MultiSplitLayout.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (1 diff)
• tools/bugreport/BugReportQueue.java (modified) (2 diffs)

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

@@ -6 +6 @@
 
 import java.awt.BorderLayout;
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.GraphicsEnvironment;
@@ -932 +933 @@
                 !args.hasOption(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));
         final MainFrame mainFrame = new MainFrame(geometry);
-        if (mainFrame.getContentPane() instanceof JComponent) {
-            contentPanePrivate = (JComponent) mainFrame.getContentPane();
+        final Container contentPane = mainFrame.getContentPane();
+        if (contentPane instanceof JComponent) {
+            contentPanePrivate = (JComponent) contentPane;
         }
         mainPanel = mainFrame.getPanel();

trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

@@ -621 +621 @@
                 while (splitChildren.hasNext()) {
                     Node splitChild = splitChildren.next();
-                    Divider dividerChild =
-                        splitChildren.hasNext() ? (Divider) (splitChildren.next()) : null;
+                    Divider dividerChild = null;
+                    if (splitChildren.hasNext()) {
+                        Node next = splitChildren.next();
+                        if (next instanceof Divider) {
+                            dividerChild = (Divider) next;
+                        }
+                    }
 
                     double childWidth;

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -1316 +1316 @@
         // convert rotatedAngle to an integer value from 0 to 360
         Long angleLong = Math.round(rotatedAngle % 360);
-        Long originalAngle = rotatedAngle != 0 && angleLong == 0 ? 360L : angleLong;
+        Long originalAngle = rotatedAngle != 0 && angleLong == 0 ? Long.valueOf(360L) : angleLong;
 
         synchronized (ROTATE_CACHE) {

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java

@@ -17 +17 @@
 public class BugReportQueue {
 
-    private static final BugReportQueue INSTANCE = new BugReportQueue();
-
     /**
      * The fallback bug report handler if none is set. Prints the stacktrace on standard error stream.
@@ -27 +25 @@
         return BugReportQueue.SuppressionMode.NONE;
     };
+
+    private static final BugReportQueue INSTANCE = new BugReportQueue();
 
     private final LinkedList<ReportedException> reportsToDisplay = new LinkedList<>();