Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 10934)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 10936)
@@ -593,5 +593,5 @@
 
         private final String name;
-        private Runnable task;
+        private final Runnable task;
 
         protected InitializationTask(String name, Runnable task) {
Index: trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 10934)
+++ trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 10936)
@@ -304,15 +304,4 @@
         }
 
-        private void restoreMapModeState() {
-            if (Main.map == null)
-                return;
-            if (oldMapMode != null) {
-                Main.map.selectMapMode(oldMapMode);
-                oldMapMode = null;
-            } else {
-                Main.map.selectSelectTool(false);
-            }
-        }
-
         class WindowEventHandler extends WindowAdapter {
             @Override
@@ -321,4 +310,15 @@
                 restoreMapModeState();
             }
+
+            private void restoreMapModeState() {
+                if (Main.map == null)
+                    return;
+                if (oldMapMode != null) {
+                    Main.map.selectMapMode(oldMapMode);
+                    oldMapMode = null;
+                } else {
+                    Main.map.selectSelectTool(false);
+                }
+            }
         }
     }
Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 10934)
+++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 10936)
@@ -93,7 +93,6 @@
             .append(runtimeVersion != null ? runtimeVersion : System.getProperty("java.version")).append(", ")
             .append(System.getProperty("java.vendor")).append(", ")
-            .append(System.getProperty("java.vm.name")).append('\n');
-
-        text.append("Screen: ");
+            .append(System.getProperty("java.vm.name"))
+            .append("\nScreen: ");
         if (!GraphicsEnvironment.isHeadless()) {
             text.append(Arrays.stream(GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()).map(gd -> {
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 10934)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 10936)
@@ -640,5 +640,5 @@
     }
 
-    private String getTitle(boolean newNode, Node n, Collection<OsmPrimitive> newSelection, List<Way> reuseWays,
+    private static String getTitle(boolean newNode, Node n, Collection<OsmPrimitive> newSelection, List<Way> reuseWays,
             boolean extendedWay) {
         String title;
Index: trunk/src/org/openstreetmap/josm/gui/ProgramArguments.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ProgramArguments.java	(revision 10934)
+++ trunk/src/org/openstreetmap/josm/gui/ProgramArguments.java	(revision 10936)
@@ -29,5 +29,4 @@
      * JOSM command line options.
      * @see <a href="https://josm.openstreetmap.de/wiki/Help/CommandLineOptions">Help/CommandLineOptions</a>
-     * @since xxx
      */
     public enum Option {
@@ -102,8 +101,8 @@
      * Construct the program arguments object
      * @param args The args passed to main.
-     */
-    public ProgramArguments(String[] args) {
+     * @since 10936
+     */
+    public ProgramArguments(String ... args) {
         Stream.of(Option.values()).forEach(o -> argMap.put(o, new ArrayList<>()));
-
         buildCommandLineArgumentMap(args);
     }
@@ -216,5 +215,5 @@
     }
 
-    private static String getValue(String[] kv) {
+    private static String getValue(String ... kv) {
         if (kv.length < 2) {
             return "";
Index: trunk/src/org/openstreetmap/josm/gui/datatransfer/AbstractStackTransferHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/datatransfer/AbstractStackTransferHandler.java	(revision 10934)
+++ trunk/src/org/openstreetmap/josm/gui/datatransfer/AbstractStackTransferHandler.java	(revision 10936)
@@ -4,4 +4,5 @@
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collection;
 
@@ -49,4 +50,7 @@
             if (df.supports(support)) {
                 try {
+                    if (Main.isDebugEnabled()) {
+                        Main.debug("{0} pasting {1} at {2}", df.getClass().getSimpleName(), Arrays.toString(support.getDataFlavors()), center);
+                    }
                     if (df.importData(support, layer, center)) {
                         return true;
@@ -55,5 +59,5 @@
                     Main.warn(e);
                 } catch (RuntimeException e) {
-                    BugReport.intercept(e).put("paster", df).put("flavors", () -> support.getDataFlavors()).warn();
+                    BugReport.intercept(e).put("paster", df).put("flavors", support::getDataFlavors).warn();
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/datatransfer/OpenTransferHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/datatransfer/OpenTransferHandler.java	(revision 10934)
+++ trunk/src/org/openstreetmap/josm/gui/datatransfer/OpenTransferHandler.java	(revision 10936)
@@ -4,4 +4,5 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 import org.openstreetmap.josm.gui.datatransfer.importers.AbstractOsmDataPaster;
@@ -22,5 +23,5 @@
     @Override
     protected Collection<AbstractOsmDataPaster> getSupportedPasters() {
-        return SUPPORTED;
+        return Collections.unmodifiableCollection(SUPPORTED);
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java	(revision 10934)
+++ trunk/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java	(revision 10936)
@@ -8,4 +8,5 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 import org.openstreetmap.josm.Main;
@@ -35,5 +36,5 @@
     @Override
     protected Collection<AbstractOsmDataPaster> getSupportedPasters() {
-        return SUPPORTED;
+        return Collections.unmodifiableCollection(SUPPORTED);
     }
 
Index: trunk/src/org/openstreetmap/josm/io/protocols/data/Handler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/protocols/data/Handler.java	(revision 10934)
+++ trunk/src/org/openstreetmap/josm/io/protocols/data/Handler.java	(revision 10936)
@@ -32,9 +32,10 @@
         String protocolHandlers = System.getProperty("java.protocol.handler.pkgs", "");
         if (!protocolHandlers.contains(pkg)) {
-            if (!protocolHandlers.isEmpty()) {
-                protocolHandlers += "|";
+            StringBuilder sb = new StringBuilder(protocolHandlers);
+            if (sb.length() > 0) {
+                sb.append('|');
             }
-            protocolHandlers += pkg;
-            Utils.updateSystemProperty("java.protocol.handler.pkgs", protocolHandlers);
+            sb.append(pkg);
+            Utils.updateSystemProperty("java.protocol.handler.pkgs", sb.toString());
         }
     }
Index: trunk/src/org/openstreetmap/josm/tools/ListenerList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ListenerList.java	(revision 10934)
+++ trunk/src/org/openstreetmap/josm/tools/ListenerList.java	(revision 10936)
@@ -106,5 +106,5 @@
     protected void failAdd(T listener) {
         throw new IllegalArgumentException(
-                MessageFormat.format("Listener {0} (instance of {1}) was already registered.", listener.toString(),
+                MessageFormat.format("Listener {0} (instance of {1}) was already registered.", listener,
                         listener.getClass().getName()));
     }
@@ -128,5 +128,5 @@
         throw new IllegalArgumentException(
                 MessageFormat.format("Listener {0} (instance of {1}) was not registered before or already removed.",
-                        listener.toString(), listener.getClass().getName()));
+                        listener, listener.getClass().getName()));
     }