Ticket #8902: datestocurrtime.diff
File datestocurrtime.diff, 4.7 KB (added by , 11 years ago) |
---|
-
src/org/openstreetmap/josm/actions/search/SearchCompiler.java
150 150 String rangeA1 = rangeA[0].trim(); 151 151 String rangeA2 = rangeA[1].trim(); 152 152 long minDate = DateUtils.fromString(rangeA1.isEmpty() ? "1980" : rangeA1).getTime(); // if min timestap is empty: use lowest possible date 153 long maxDate = rangeA2.isEmpty() ? new Date().getTime() : DateUtils.fromString(rangeA2).getTime(); // if max timestamp is empty: use "now"153 long maxDate = rangeA2.isEmpty() ? System.currentTimeMillis() : DateUtils.fromString(rangeA2).getTime(); // if max timestamp is empty: use "now" 154 154 return new TimestampRange(minDate, maxDate); 155 155 } else 156 156 /* -
src/org/openstreetmap/josm/gui/layer/GpxLayer.java
121 121 */ 122 122 public Date[] getMinMaxTimeForAllTracks() { 123 123 double min=1e100, max=-1e100, t; 124 double now = new Date().getTime()/1000.0;124 double now = System.currentTimeMillis()/1000.0; 125 125 for (GpxTrack trk: data.tracks) { 126 126 for (GpxTrackSegment seg : trk.getSegments()) { 127 127 for (WayPoint pnt : seg.getWayPoints()) { … … 532 532 } 533 533 oldWp = null; 534 534 } 535 double now = new Date().getTime()/1000.0;535 double now = System.currentTimeMillis()/1000.0; 536 536 if (colored == colorModes.time) { 537 537 Date[] bounds = getMinMaxTimeForAllTracks(); 538 538 if (bounds!=null) { -
src/org/openstreetmap/josm/io/CacheCustomContent.java
86 86 * @return Returns the data 87 87 */ 88 88 public byte[] updateIfRequired() throws T { 89 if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < new Date().getTime()/100089 if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < System.currentTimeMillis()/1000 90 90 || !isCacheValid()) 91 91 return updateForce(); 92 92 return getData(); … … 97 97 * @return Returns the data as string 98 98 */ 99 99 public String updateIfRequiredString() throws T { 100 if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < new Date().getTime()/1000100 if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < System.currentTimeMillis()/1000 101 101 || !isCacheValid()) 102 102 return updateForceString(); 103 103 return getDataString(); … … 110 110 public byte[] updateForce() throws T { 111 111 this.data = updateData(); 112 112 saveToDisk(); 113 Main.pref.putInteger("cache." + ident, (int)( new Date().getTime()/1000));113 Main.pref.putInteger("cache." + ident, (int)(System.currentTimeMillis()/1000)); 114 114 return data; 115 115 } 116 116 -
src/org/openstreetmap/josm/io/CacheFiles.java
109 109 110 110 // Update last mod time so we don't expire recently used data 111 111 if(updateModTime) { 112 data.setLastModified( new Date().getTime());112 data.setLastModified(System.currentTimeMillis()); 113 113 } 114 114 115 115 byte[] bytes = new byte[(int) data.length()]; … … 161 161 } 162 162 // Update last mod time so we don't expire recently used images 163 163 if(updateModTime) { 164 img.setLastModified( new Date().getTime());164 img.setLastModified(System.currentTimeMillis()); 165 165 } 166 166 return ImageIO.read(img); 167 167 } catch(Exception e) { … … 353 353 private boolean isExpired(File file) { 354 354 if(CacheFiles.EXPIRE_NEVER == this.expire) 355 355 return false; 356 return (file.lastModified() < ( new Date().getTime() - expire*1000));356 return (file.lastModified() < (System.currentTimeMillis() - expire*1000)); 357 357 } 358 358 }