Changeset 10181 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-05-11T04:44:00+02:00 (4 years ago)

Author:

Don-vip

Message:

sonar - squid:S2184 - Math operands should be cast before assignment

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• CachedFile.java (modified) (1 diff)
• MessageNotifier.java (modified) (1 diff)
• OsmServerWriter.java (modified) (1 diff)

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

@@ -76 +76 @@
 
     public static final long DEFAULT_MAXTIME = -1L;
-    public static final long DAYS = 24*60*60; // factor to get caching time in days
+    public static final long DAYS = 24L*60L*60L; // factor to get caching time in days
 
     private final Map<String, String> httpHeaders = new ConcurrentHashMap<>();

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

@@ -96 +96 @@
             Main.info(tr("{0} not available (offline mode)", tr("Message notifier")));
         } else if (!isRunning() && interval > 0 && isUserEnoughIdentified()) {
-            task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, interval * 60, TimeUnit.SECONDS);
+            task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, interval * 60L, TimeUnit.SECONDS);
             Main.info("Message notifier active (checks every "+interval+" minute"+(interval > 1 ? "s" : "")+')');
         }

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

@@ -68 +68 @@
         }
         double uploadsPerMs = (double) progress / elapsed;
-        double uploadsLeft = listSize - progress;
+        double uploadsLeft = (double) listSize - progress;
         long msLeft = (long) (uploadsLeft / uploadsPerMs);
         long minutesLeft = msLeft / MSECS_PER_MINUTE;