Changeset 11100 in josm for trunk

Timestamp:

2016-10-08T03:02:51+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2148 - Underscores should be used to make large numbers readable

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JumpToAction.java (modified) (1 diff)
• data/SystemOfMeasurement.java (modified) (1 diff)
• data/osm/Storage.java (modified) (1 diff)
• data/osm/visitor/paint/MapPaintSettings.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• data/projection/CustomProjection.java (modified) (1 diff)
• data/projection/datum/NTV2Util.java (modified) (1 diff)
• data/validation/OsmValidator.java (modified) (1 diff)
• data/validation/tests/LongSegment.java (modified) (1 diff)
• gui/Notification.java (modified) (2 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (1 diff)
• gui/io/DownloadFileTask.java (modified) (1 diff)
• gui/progress/PleaseWaitProgressMonitor.java (modified) (1 diff)
• gui/progress/ProgressMonitor.java (modified) (1 diff)
• gui/util/GuiHelper.java (modified) (1 diff)
• io/BoundingBoxDownloader.java (modified) (1 diff)
• io/DefaultProxySelector.java (modified) (1 diff)
• io/NoteReader.java (modified) (1 diff)
• io/remotecontrol/RemoteControlHttpsServer.java (modified) (1 diff)
• tools/AudioPlayer.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/JumpToAction.java

@@ -198 +198 @@
             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));

trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java

@@ -42 +42 @@
      * @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");
 
     /**

trunk/src/org/openstreetmap/josm/data/osm/Storage.java

@@ -275 +275 @@
      */
     private static int rehash(int h) {
-        return (1103515245*h) >> 2;
+        return (1_103_515_245*h) >> 2;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java

@@ -95 +95 @@
         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);

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1814 +1814 @@
         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);

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -265 +265 @@
                 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);

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java

@@ -98 +98 @@
             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);
     }

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -293 +293 @@
         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;

trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java

@@ -50 +50 @@
     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);
     }
 

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

@@ -53 +53 @@
      * 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 +59 @@
      * (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;

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -657 +657 @@
          */
         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));
             }

trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

@@ -117 +117 @@
                 OutputStream out = new FileOutputStream(file)
             ) {
-                byte[] buffer = new byte[32768];
+                byte[] buffer = new byte[32_768];
                 int count = 0;
                 long p1 = 0;

trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

@@ -37 +37 @@
     }
 
-    public static final int PROGRESS_BAR_MAX = 10000;
+    public static final int PROGRESS_BAR_MAX = 10_000;
     private final Component dialogParent;
 

trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java

@@ -38 +38 @@
 
     /** Ticks count used, when no other value is supplied */
-    int DEFAULT_TICKS = 10000;
+    int DEFAULT_TICKS = 10_000;
 
     /**

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -482 +482 @@
      */
     public static void extendTooltipDelay(Component c) {
-        extendTooltipDelay(c, 60000);
+        extendTooltipDelay(c, 60_000);
     }
 

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -207 +207 @@
         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;

trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

@@ -97 +97 @@
             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."));

trunk/src/org/openstreetmap/josm/io/NoteReader.java

@@ -78 +78 @@
             case "osm-notes":
                 parseMode = NoteParseMode.DUMP;
-                notes = new ArrayList<>(10000);
+                notes = new ArrayList<>(10_000);
                 return;
             }

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -140 +140 @@
         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());

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

@@ -312 +312 @@
                                 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) {

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

@@ -80 +80 @@
 
     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;
 
     /**