Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 6101)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 6102)
@@ -10,5 +10,4 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -151,5 +150,5 @@
                         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
Index: /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 6101)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 6102)
@@ -122,5 +122,5 @@
     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,5 +533,5 @@
                 oldWp = null;
             }
-            double now = new Date().getTime()/1000.0;
+            double now = System.currentTimeMillis()/1000.0;
             if (colored == colorModes.time) {
                 Date[] bounds = getMinMaxTimeForAllTracks();
Index: /trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java	(revision 6101)
+++ /trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java	(revision 6102)
@@ -9,5 +9,4 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.Date;
 
 import org.openstreetmap.josm.Main;
@@ -87,5 +86,5 @@
      */
     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,5 +97,5 @@
      */
     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,5 +110,5 @@
         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;
     }
Index: /trunk/src/org/openstreetmap/josm/io/CacheFiles.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/CacheFiles.java	(revision 6101)
+++ /trunk/src/org/openstreetmap/josm/io/CacheFiles.java	(revision 6102)
@@ -7,5 +7,4 @@
 import java.math.BigInteger;
 import java.security.MessageDigest;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.Set;
@@ -110,5 +109,5 @@
             // Update last mod time so we don't expire recently used data
             if(updateModTime) {
-                data.setLastModified(new Date().getTime());
+                data.setLastModified(System.currentTimeMillis());
             }
 
@@ -162,5 +161,5 @@
             // 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,5 +353,5 @@
         if(CacheFiles.EXPIRE_NEVER == this.expire)
             return false;
-        return (file.lastModified() < (new Date().getTime() - expire*1000));
+        return (file.lastModified() < (System.currentTimeMillis() - expire*1000));
     }
 }
Index: /trunk/src/org/openstreetmap/josm/io/FileImporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/FileImporter.java	(revision 6101)
+++ /trunk/src/org/openstreetmap/josm/io/FileImporter.java	(revision 6102)
@@ -105,5 +105,5 @@
     @Override
     public int compareTo(FileImporter other) {
-        return (new Double(this.getPriority())).compareTo(other.getPriority());
+        return Double.compare(this.getPriority(), other.getPriority());
     }