Changeset 6102 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-08-02T23:14:44+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8902 - Small performance enhancements / coding style (patch by shinigami):

• effective double comparison
• new Date().getTime() => System.currentTimeMillis()

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchCompiler.java (modified) (2 diffs)
• gui/layer/GpxLayer.java (modified) (2 diffs)
• io/CacheCustomContent.java (modified) (4 diffs)
• io/CacheFiles.java (modified) (4 diffs)
• io/FileImporter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -10 +10 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -151 +150 @@
                         String rangeA2 = rangeA[1].trim();
                         long minDate = DateUtils.fromString(rangeA1.isEmpty() ? "1980" : rangeA1).getTime(); // if min timestap is empty: use lowest possible date
-                        long maxDate = rangeA2.isEmpty() ? new Date().getTime() : DateUtils.fromString(rangeA2).getTime(); // if max timestamp is empty: use "now"
+                        long maxDate = rangeA2.isEmpty() ? System.currentTimeMillis() : DateUtils.fromString(rangeA2).getTime(); // if max timestamp is empty: use "now"
                         return new TimestampRange(minDate, maxDate);
                     } else

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -122 +122 @@
     public Date[] getMinMaxTimeForAllTracks() {
         double min=1e100, max=-1e100, t;
-        double now = new Date().getTime()/1000.0;
+        double now = System.currentTimeMillis()/1000.0;
         for (GpxTrack trk: data.tracks) {
             for (GpxTrackSegment seg : trk.getSegments()) {
@@ -533 +533 @@
                 oldWp = null;
             }
-            double now = new Date().getTime()/1000.0;
+            double now = System.currentTimeMillis()/1000.0;
             if (colored == colorModes.time) {
                 Date[] bounds = getMinMaxTimeForAllTracks();

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

@@ -9 +9 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.Date;
 
 import org.openstreetmap.josm.Main;
@@ -87 +86 @@
      */
     public byte[] updateIfRequired() throws T {
-        if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < new Date().getTime()/1000
+        if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < System.currentTimeMillis()/1000
                 || !isCacheValid())
             return updateForce();
@@ -98 +97 @@
      */
     public String updateIfRequiredString() throws T {
-        if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < new Date().getTime()/1000
+        if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < System.currentTimeMillis()/1000
                 || !isCacheValid())
             return updateForceString();
@@ -111 +110 @@
         this.data = updateData();
         saveToDisk();
-        Main.pref.putInteger("cache." + ident, (int)(new Date().getTime()/1000));
+        Main.pref.putInteger("cache." + ident, (int)(System.currentTimeMillis()/1000));
         return data;
     }

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

@@ -7 +7 @@
 import java.math.BigInteger;
 import java.security.MessageDigest;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.Set;
@@ -110 +109 @@
             // Update last mod time so we don't expire recently used data
             if(updateModTime) {
-                data.setLastModified(new Date().getTime());
+                data.setLastModified(System.currentTimeMillis());
             }
 
@@ -162 +161 @@
             // Update last mod time so we don't expire recently used images
             if(updateModTime) {
-                img.setLastModified(new Date().getTime());
+                img.setLastModified(System.currentTimeMillis());
             }
             return ImageIO.read(img);
@@ -354 +353 @@
         if(CacheFiles.EXPIRE_NEVER == this.expire)
             return false;
-        return (file.lastModified() < (new Date().getTime() - expire*1000));
+        return (file.lastModified() < (System.currentTimeMillis() - expire*1000));
     }
 }

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

@@ -105 +105 @@
     @Override
     public int compareTo(FileImporter other) {
-        return (new Double(this.getPriority())).compareTo(other.getPriority());
+        return Double.compare(this.getPriority(), other.getPriority());
     }