Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 8465)
@@ -107,5 +107,5 @@
             // Build a new list of VM parameters to modify it below if needed (default implementation returns an UnmodifiableList instance)
             List<String> vmArguments = new ArrayList<>(ManagementFactory.getRuntimeMXBean().getInputArguments());
-            for (ListIterator<String> it = vmArguments.listIterator(); it.hasNext(); ) {
+            for (ListIterator<String> it = vmArguments.listIterator(); it.hasNext();) {
                 String value = it.next();
                 if (value.contains("=")) {
Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 8465)
@@ -228,5 +228,5 @@
         for (int i=1; i<selectedNodes.size(); i++) {
             List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
-            for (Iterator<Way> it = result.iterator(); it.hasNext(); ) {
+            for (Iterator<Way> it = result.iterator(); it.hasNext();) {
                 if (!ref.contains(it.next())) {
                     it.remove();
@@ -236,5 +236,5 @@
 
         // Remove broken ways
-        for (Iterator<Way> it = result.iterator(); it.hasNext(); ) {
+        for (Iterator<Way> it = result.iterator(); it.hasNext();) {
             if (it.next().getNodesCount() <= 2) {
                 it.remove();
@@ -246,5 +246,5 @@
         else {
             // Return only selected ways
-            for (Iterator<Way> it = result.iterator(); it.hasNext(); ) {
+            for (Iterator<Way> it = result.iterator(); it.hasNext();) {
                 if (!selectedWays.contains(it.next())) {
                     it.remove();
Index: trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java	(revision 8465)
@@ -157,5 +157,5 @@
         for (int i=1; i<selectedNodes.size(); i++) {
             List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
-            for (Iterator<Way> it = result.iterator(); it.hasNext(); ) {
+            for (Iterator<Way> it = result.iterator(); it.hasNext();) {
                 if (!ref.contains(it.next())) {
                     it.remove();
@@ -165,5 +165,5 @@
 
         // Remove broken ways
-        for (Iterator<Way> it = result.iterator(); it.hasNext(); ) {
+        for (Iterator<Way> it = result.iterator(); it.hasNext();) {
             if (it.next().getNodesCount() <= 2) {
                 it.remove();
@@ -175,5 +175,5 @@
         else {
             // Return only selected ways
-            for (Iterator<Way> it = result.iterator(); it.hasNext(); ) {
+            for (Iterator<Way> it = result.iterator(); it.hasNext();) {
                 if (!selectedWays.contains(it.next())) {
                     it.remove();
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 8465)
@@ -1545,5 +1545,5 @@
                 if (selectedWays.size()==1) {
                     Way w = selectedWays.iterator().next();
-                    Collection <EastNorth> pointsToProject = new ArrayList<>();
+                    Collection<EastNorth> pointsToProject = new ArrayList<>();
                     if (w.getNodesCount()<1000) {
                         for (Node n: w.getNodes()) {
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 8465)
@@ -340,5 +340,5 @@
             Main.map.mapView.setNewCursor(ctrl ? cursorTranslate : alt ? cursorCreateNew : shift ? cursorCreateNodes : cursor, this);
         }
-    };
+    }
 
     @Override
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 8465)
@@ -1387,6 +1387,5 @@
             } else if (f.getType().isAssignableFrom(Map.class)) {
                 value = mapFromJson(key_value.getValue());
-            }
-            else
+            } else
                 throw new RuntimeException("unsupported preference primitive type");
 
Index: trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java	(revision 8465)
@@ -38,5 +38,5 @@
  * </ul>
  */
-public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimitive>>{
+public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimitive>> {
     private final List<Conflict<? extends OsmPrimitive>> conflicts;
     private CopyOnWriteArrayList<IConflictListener> listeners;
Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java	(revision 8465)
@@ -109,5 +109,7 @@
             }
         }
-        while (defaultLayers.remove(null));
+        while (defaultLayers.remove(null)) {
+            // Do nothing
+        }
         Collections.sort(defaultLayers);
         buildIdMap(defaultLayers, defaultLayerIds);
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 8465)
@@ -296,5 +296,5 @@
                 DataSet ds = dataSet;
                 // Find DataSet (can be null for several nodes when undoing nodes creation, see #7162)
-                for (Iterator<Node> it = nodes.iterator(); it.hasNext() && ds == null; ) {
+                for (Iterator<Node> it = nodes.iterator(); it.hasNext() && ds == null;) {
                     ds = it.next().getDataSet();
                 }
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 8465)
@@ -355,5 +355,5 @@
 
         private static void removeMetaRules(MapCSSStyleSource source) {
-            for (Iterator<MapCSSRule> it = source.rules.iterator(); it.hasNext(); ) {
+            for (Iterator<MapCSSRule> it = source.rules.iterator(); it.hasNext();) {
                 MapCSSRule x = it.next();
                 if (x.selector instanceof GeneralSelector) {
Index: trunk/src/org/openstreetmap/josm/gui/FileDrop.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 8465)
@@ -131,8 +131,8 @@
                 @Override
                 public void dragEnter(DropTargetDragEvent evt) {
-                    Main.trace("FileDrop: dragEnter event." );
+                    Main.trace("FileDrop: dragEnter event.");
 
                     // Is this an acceptable drag event?
-                    if (isDragOk(evt) ) {
+                    if (isDragOk(evt)) {
                         // If it's a Swing component, set its border
                         if (c instanceof JComponent) {
@@ -145,5 +145,5 @@
 
                         // Acknowledge that it's okay to enter
-                        evt.acceptDrag( DnDConstants.ACTION_COPY);
+                        evt.acceptDrag(DnDConstants.ACTION_COPY);
                         Main.trace("FileDrop: event accepted.");
                     } else {
@@ -254,6 +254,6 @@
                     Main.debug("FileDrop: dropActionChanged event.");
                     // Is this an acceptable drag event?
-                    if (isDragOk(evt) ) {
-                        evt.acceptDrag( DnDConstants.ACTION_COPY);
+                    if (isDragOk(evt)) {
+                        evt.acceptDrag(DnDConstants.ACTION_COPY);
                         Main.debug("FileDrop: event accepted.");
                     } else {
@@ -369,6 +369,6 @@
             // Is the flavor a file list?
             final DataFlavor curFlavor = flavors[i];
-            if (curFlavor.equals( DataFlavor.javaFileListFlavor ) ||
-                    curFlavor.isRepresentationClassReader()){
+            if (curFlavor.equals(DataFlavor.javaFileListFlavor) ||
+                    curFlavor.isRepresentationClassReader()) {
                 ok = true;
             }
@@ -637,5 +637,5 @@
 
             // String
-            if (flavor.equals( DataFlavor.stringFlavor))
+            if (flavor.equals(DataFlavor.stringFlavor))
                 return true;
 
Index: trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 8465)
@@ -169,9 +169,9 @@
             // For layers containing complex shapes, check that center is in one
             // of its shapes (fix #7910)
-            for (Iterator<ImageryInfo> iti = inViewLayers.iterator(); iti.hasNext(); ) {
+            for (Iterator<ImageryInfo> iti = inViewLayers.iterator(); iti.hasNext();) {
                 List<Shape> shapes = iti.next().getBounds().getShapes();
                 if (shapes != null && !shapes.isEmpty()) {
                     boolean found = false;
-                    for (Iterator<Shape> its = shapes.iterator(); its.hasNext() && !found; ) {
+                    for (Iterator<Shape> its = shapes.iterator(); its.hasNext() && !found;) {
                         found = its.next().contains(pos);
                     }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java	(revision 8465)
@@ -18,5 +18,5 @@
 import org.openstreetmap.josm.gui.conflict.pair.ListRole;
 
-public class NodeListMergeModel extends ListMergeModel<Node>{
+public class NodeListMergeModel extends ListMergeModel<Node> {
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java	(revision 8465)
@@ -21,5 +21,5 @@
  *
  */
-public class RelationMemberListMergeModel extends ListMergeModel<RelationMember>{
+public class RelationMemberListMergeModel extends ListMergeModel<RelationMember> {
 
     @Override
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java	(revision 8465)
@@ -217,5 +217,5 @@
     public void windowClosed(WindowEvent e) {
         RelationEditor editor = (RelationEditor)e.getWindow();
-        for (Iterator<Entry<DialogContext, RelationEditor>> it = openDialogs.entrySet().iterator(); it.hasNext(); ) {
+        for (Iterator<Entry<DialogContext, RelationEditor>> it = openDialogs.entrySet().iterator(); it.hasNext();) {
             if (editor.equals(it.next().getValue())) {
                 it.remove();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java	(revision 8465)
@@ -338,5 +338,5 @@
      */
     public List<TestError> getErrors() {
-        return errors != null ? errors : Collections.<TestError> emptyList();
+        return errors != null ? errors : Collections.<TestError>emptyList();
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java	(revision 8465)
@@ -108,5 +108,5 @@
      */
     public void hide(HistoryBrowserDialog dialog) {
-        for (Iterator<Entry<Long, HistoryBrowserDialog>> it = dialogs.entrySet().iterator(); it.hasNext(); ) {
+        for (Iterator<Entry<Long, HistoryBrowserDialog>> it = dialogs.entrySet().iterator(); it.hasNext();) {
             if (Objects.equals(it.next().getValue(), dialog)) {
                 it.remove();
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java	(revision 8465)
@@ -17,5 +17,5 @@
  *
  */
-public class AutoCompletionListItem implements Comparable<AutoCompletionListItem>{
+public class AutoCompletionListItem implements Comparable<AutoCompletionListItem> {
 
     /** the pritority of this item */
Index: trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java	(revision 8465)
@@ -24,5 +24,5 @@
      * @param prims - primitives to highlight/unhighlight
      */
-    public boolean highlight(Collection <? extends OsmPrimitive> prims) {
+    public boolean highlight(Collection<? extends OsmPrimitive> prims) {
         return highlight(prims, false);
     }
@@ -33,5 +33,5 @@
      * @param only - remove previous highlighting
      */
-    public boolean highlight(Collection <? extends OsmPrimitive> prims, boolean only) {
+    public boolean highlight(Collection<? extends OsmPrimitive> prims, boolean only) {
         boolean needsRepaint = false;
         if (only) {
@@ -57,5 +57,5 @@
      * @param prims - primitives to highlight/unhighlight
      */
-    public boolean highlightOnly(Collection <? extends OsmPrimitive> prims) {
+    public boolean highlightOnly(Collection<? extends OsmPrimitive> prims) {
         return highlight(prims, true);
     }
Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 8465)
@@ -532,6 +532,5 @@
                     Rectangle newSplitChildBounds = boundsWithYandHeight(bounds, y, newHeight);
                     layout2(splitChild, newSplitChildBounds);
-                }
-                else if ((availableHeight > 0.0) && (splitChildWeight > 0.0)) {
+                } else if ((availableHeight > 0.0) && (splitChildWeight > 0.0)) {
                     double allocatedHeight = (splitChild.equals(lastWeightedChild))
                     ? availableHeight
@@ -541,6 +540,5 @@
                     layout2(splitChild, newSplitChildBounds);
                     availableHeight -= allocatedHeight;
-                }
-                else {
+                } else {
                     double existingHeight = splitChildBounds.getHeight();
                     Rectangle newSplitChildBounds = boundsWithYandHeight(bounds, y, existingHeight);
@@ -619,10 +617,8 @@
                     if (getFloatingDividers()) {
                         childWidth = preferredNodeSize(splitChild).getWidth();
-                    }
-                    else {
+                    } else {
                         if (dividerChild != null) {
                             childWidth = dividerChild.getBounds().getX() - x;
-                        }
-                        else {
+                        } else {
                             childWidth = split.getBounds().getMaxX() - x;
                         }
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java	(revision 8465)
@@ -3,7 +3,7 @@
 
 import java.io.File;
-import java.net.InetAddress;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 
@@ -90,5 +90,5 @@
                 return a;
             }
-        };
+        }
         throw new UnknownHostException();
     }
@@ -106,5 +106,5 @@
                 return a;
             }
-        };
+        }
         throw new UnknownHostException();
     }
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 8465)
@@ -176,5 +176,5 @@
             String command = questionPos < 0 ? url : url.substring(0, questionPos);
 
-            Map <String,String> headers = new HashMap<>();
+            Map<String,String> headers = new HashMap<>();
             int k=0, MAX_HEADERS=20;
             while (k<MAX_HEADERS) {
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 8464)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 8465)
@@ -1283,5 +1283,5 @@
 
         Set<String> plugins = new HashSet<>(
-                Main.pref.getCollection("plugins",Collections.<String> emptySet())
+                Main.pref.getCollection("plugins",Collections.<String>emptySet())
         );
         final PluginInformation pluginInfo = plugin.getPluginInformation();
@@ -1324,5 +1324,5 @@
     public static String getBugReportText() {
         StringBuilder text = new StringBuilder();
-        List <String> pl = new LinkedList<>(Main.pref.getCollection("plugins", new LinkedList<String>()));
+        List<String> pl = new LinkedList<>(Main.pref.getCollection("plugins", new LinkedList<String>()));
         for (final PluginProxy pp : pluginList) {
             PluginInformation pi = pp.getPluginInformation();