Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 12807)
+++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 12808)
@@ -6,4 +6,5 @@
 
 import java.awt.BorderLayout;
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.GraphicsEnvironment;
@@ -932,6 +933,7 @@
                 !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();
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 12807)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 12808)
@@ -621,6 +621,11 @@
                 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;
Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 12807)
+++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 12808)
@@ -1316,5 +1316,5 @@
         // 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) {
Index: /trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java	(revision 12807)
+++ /trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java	(revision 12808)
@@ -17,6 +17,4 @@
 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,4 +25,6 @@
         return BugReportQueue.SuppressionMode.NONE;
     };
+
+    private static final BugReportQueue INSTANCE = new BugReportQueue();
 
     private final LinkedList<ReportedException> reportsToDisplay = new LinkedList<>();