Index: /trunk/src/org/openstreetmap/josm/actions/JumpToAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JumpToAction.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/actions/JumpToAction.java	(revision 11100)
@@ -198,5 +198,5 @@
             int zoomLvl = 18;
             if (m > 0)
-                zoomLvl = (int) Math.round((-1) * Math.log(m/10000000)/Math.log(2));
+                zoomLvl = (int) Math.round((-1) * Math.log(m/10_000_000)/Math.log(2));
 
             url.setText(OsmUrlToBounds.getURL(dlat, dlon, zoomLvl));
Index: /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java	(revision 11100)
@@ -42,5 +42,5 @@
      * @since 3406
      */
-    public static final SystemOfMeasurement METRIC = new SystemOfMeasurement(1, "m", 1000, "km", "km/h", 3.6, 10000, "ha");
+    public static final SystemOfMeasurement METRIC = new SystemOfMeasurement(1, "m", 1000, "km", "km/h", 3.6, 10_000, "ha");
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 11100)
@@ -275,5 +275,5 @@
      */
     private static int rehash(int h) {
-        return (1103515245*h) >> 2;
+        return (1_103_515_245*h) >> 2;
     }
 
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java	(revision 11100)
@@ -95,7 +95,7 @@
         showHeadArrowOnly = Main.pref.getBoolean("draw.segment.head_only", false);
 
-        showNamesDistance = Main.pref.getInteger("mappaint.shownames", 10000000);
-        useStrokesDistance = Main.pref.getInteger("mappaint.strokes", 10000000);
-        showIconsDistance = Main.pref.getInteger("mappaint.showicons", 10000000);
+        showNamesDistance = Main.pref.getInteger("mappaint.shownames", 10_000_000);
+        useStrokesDistance = Main.pref.getInteger("mappaint.strokes", 10_000_000);
+        showIconsDistance = Main.pref.getInteger("mappaint.showicons", 10_000_000);
 
         selectedNodeSize = Main.pref.getInteger("mappaint.node.selected-size", 5);
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 11100)
@@ -1814,5 +1814,5 @@
         private final int directExecutionTaskSize;
 
-        private final boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10000000);
+        private final boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10_000_000);
         private final boolean drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true);
         private final boolean drawRestriction = Main.pref.getBoolean("mappaint.restriction", true);
Index: /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java	(revision 11100)
@@ -265,6 +265,6 @@
                 this.lon0 = 6d * zone - 183d;
                 this.k0 = 0.9996;
-                this.x0 = 500000;
-                this.y0 = parameters.containsKey(Param.south.key) ? 10000000 : 0;
+                this.x0 = 500_000;
+                this.y0 = parameters.containsKey(Param.south.key) ? 10_000_000 : 0;
             }
             String s = parameters.get(Param.x_0.key);
Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java	(revision 11100)
@@ -98,5 +98,5 @@
             j = getIntLE(b, 0);
         }
-        long l = ((long) i << 32) | (j & 0x00000000FFFFFFFFL);
+        long l = ((long) i << 32) | (j & 0x0000_0000_FFFF_FFFFL);
         return Double.longBitsToDouble(l);
     }
Index: /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 11100)
@@ -293,5 +293,5 @@
         String code = Main.getProjection().toCode();
         if (Arrays.asList(ProjectionPreference.wgs84.allCodes()).contains(code)) {
-            OsmValidator.griddetail = 10000;
+            OsmValidator.griddetail = 10_000;
         } else if (Arrays.asList(ProjectionPreference.mercator.allCodes()).contains(code)) {
             OsmValidator.griddetail = 0.01;
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java	(revision 11100)
@@ -50,5 +50,5 @@
     public void startTest(ProgressMonitor monitor) {
         super.startTest(monitor);
-        maxlength = Main.pref.getInteger("validator.maximum.segment.length", 15000);
+        maxlength = Main.pref.getInteger("validator.maximum.segment.length", 15_000);
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/Notification.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/Notification.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/gui/Notification.java	(revision 11100)
@@ -53,5 +53,5 @@
      * Somewhat longer message (10 s).
      */
-    public static final int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10000);
+    public static final int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10_000);
 
     /**
@@ -59,5 +59,5 @@
      * (Make sure is still sensible to show as a notification)
      */
-    public static final int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20000);
+    public static final int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20_000);
 
     private Component content;
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 11100)
@@ -657,6 +657,6 @@
          */
         public synchronized void sort() {
-            if (selection.size() <= Main.pref.getInteger("selection.no_sort_above", 100000)) {
-                boolean quick = selection.size() > Main.pref.getInteger("selection.fast_sort_above", 10000);
+            if (selection.size() <= Main.pref.getInteger("selection.no_sort_above", 100_000)) {
+                boolean quick = selection.size() > Main.pref.getInteger("selection.fast_sort_above", 10_000);
                 selection.sort(new OsmPrimitiveComparator(quick, false));
             }
Index: /trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java	(revision 11100)
@@ -117,5 +117,5 @@
                 OutputStream out = new FileOutputStream(file)
             ) {
-                byte[] buffer = new byte[32768];
+                byte[] buffer = new byte[32_768];
                 int count = 0;
                 long p1 = 0;
Index: /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java	(revision 11100)
@@ -37,5 +37,5 @@
     }
 
-    public static final int PROGRESS_BAR_MAX = 10000;
+    public static final int PROGRESS_BAR_MAX = 10_000;
     private final Component dialogParent;
 
Index: /trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java	(revision 11100)
@@ -38,5 +38,5 @@
 
     /** Ticks count used, when no other value is supplied */
-    int DEFAULT_TICKS = 10000;
+    int DEFAULT_TICKS = 10_000;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 11100)
@@ -482,5 +482,5 @@
      */
     public static void extendTooltipDelay(Component c) {
-        extendTooltipDelay(c, 60000);
+        extendTooltipDelay(c, 60_000);
     }
 
Index: /trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java	(revision 11100)
@@ -207,5 +207,5 @@
         CheckParameterUtil.ensureThat(noteLimit > 0, "Requested note limit is less than 1.");
         // see result_limit in https://github.com/openstreetmap/openstreetmap-website/blob/master/app/controllers/notes_controller.rb
-        CheckParameterUtil.ensureThat(noteLimit <= 10000, "Requested note limit is over API hard limit of 10000.");
+        CheckParameterUtil.ensureThat(noteLimit <= 10_000, "Requested note limit is over API hard limit of 10000.");
         CheckParameterUtil.ensureThat(daysClosed >= -1, "Requested note limit is less than -1.");
         String url = "notes?limit=" + noteLimit + "&closed=" + daysClosed + "&bbox=" + lon1 + ',' + lat1 + ',' + lon2 + ',' + lat2;
Index: /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 11100)
@@ -97,5 +97,5 @@
             return 0;
         }
-        if (port <= 0 || port > 65535) {
+        if (port <= 0 || port > 65_535) {
             Main.error(tr("Illegal port number in preference ''{0}''. Got {1}.", property, port));
             Main.error(tr("The proxy will not be used."));
Index: /trunk/src/org/openstreetmap/josm/io/NoteReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/NoteReader.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/io/NoteReader.java	(revision 11100)
@@ -78,5 +78,5 @@
             case "osm-notes":
                 parseMode = NoteParseMode.DUMP;
-                notes = new ArrayList<>(10000);
+                notes = new ArrayList<>(10_000);
                 return;
             }
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java	(revision 11100)
@@ -140,5 +140,5 @@
         X509CertInfo info = new X509CertInfo();
         Date from = new Date();
-        Date to = new Date(from.getTime() + days * 86400000L);
+        Date to = new Date(from.getTime() + days * 86_400_000L);
         CertificateValidity interval = new CertificateValidity(from, to);
         BigInteger sn = new BigInteger(64, new SecureRandom());
Index: /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java	(revision 11100)
@@ -312,6 +312,6 @@
                                 bytesPerSecond = audioFormat.getFrameRate() /* frames per second */
                                 * audioFormat.getFrameSize() /* bytes per frame */;
-                                if (speed * bytesPerSecond > 256000.0) {
-                                    speed = 256000 / bytesPerSecond;
+                                if (speed * bytesPerSecond > 256_000.0) {
+                                    speed = 256_000 / bytesPerSecond;
                                 }
                                 if (calibratedOffset > 0.0) {
Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 11099)
+++ /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 11100)
@@ -80,7 +80,7 @@
 
     private static final int MILLIS_OF_SECOND = 1000;
-    private static final int MILLIS_OF_MINUTE = 60000;
-    private static final int MILLIS_OF_HOUR = 3600000;
-    private static final int MILLIS_OF_DAY = 86400000;
+    private static final int MILLIS_OF_MINUTE = 60_000;
+    private static final int MILLIS_OF_HOUR = 3_600_000;
+    private static final int MILLIS_OF_DAY = 86_400_000;
 
     /**