diff --git a/htroot/ContentIntegrationPHPBB3_p.java b/htroot/ContentIntegrationPHPBB3_p.java index 2ba20051a..e0ca50f15 100644 --- a/htroot/ContentIntegrationPHPBB3_p.java +++ b/htroot/ContentIntegrationPHPBB3_p.java @@ -23,8 +23,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import java.io.File; -import java.util.Date; - import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.content.dao.Dao; @@ -107,7 +105,7 @@ public class ContentIntegrationPHPBB3_p { dbpw ); - int files = db.writeSurrogates(db.query(0, -1, 100), sb.surrogatesInPath, "fullexport-" + GenericFormatter.SHORT_SECOND_FORMATTER.format(new Date()), ppf); + int files = db.writeSurrogates(db.query(0, -1, 100), sb.surrogatesInPath, "fullexport-" + GenericFormatter.SHORT_SECOND_FORMATTER.format(), ppf); prop.put("export", 1); prop.put("export_files", files); db.close(); diff --git a/htroot/IndexControlURLs_p.java b/htroot/IndexControlURLs_p.java index ffd6aaa5d..11e9b4032 100644 --- a/htroot/IndexControlURLs_p.java +++ b/htroot/IndexControlURLs_p.java @@ -28,7 +28,6 @@ import java.io.File; import java.io.IOException; import java.net.MalformedURLException; -import java.util.Date; import java.util.Iterator; import net.yacy.cora.date.GenericFormatter; @@ -102,7 +101,7 @@ public class IndexControlURLs_p { prop.put("reload", 1); } else { prop.put("lurlexport", 1); - prop.put("lurlexport_exportfile", sb.getDataPath() + "/DATA/EXPORT/" + GenericFormatter.SHORT_SECOND_FORMATTER.format(new Date())); + prop.put("lurlexport_exportfile", sb.getDataPath() + "/DATA/EXPORT/" + GenericFormatter.SHORT_SECOND_FORMATTER.format()); if (export == null) { // there has never been an export prop.put("lurlexportfinished", 0); diff --git a/htroot/api/bookmarks/posts/get.java b/htroot/api/bookmarks/posts/get.java index 1d6a22de1..637c9deda 100755 --- a/htroot/api/bookmarks/posts/get.java +++ b/htroot/api/bookmarks/posts/get.java @@ -28,7 +28,7 @@ public class get { if (post != null && post.containsKey("date")) { date = post.get("date"); } else { - date = ISO8601Formatter.FORMATTER.format(new Date(System.currentTimeMillis())); + date = ISO8601Formatter.FORMATTER.format(); } // if an extended xml should be used diff --git a/htroot/cytag.java b/htroot/cytag.java index ab2e93c52..db5cb9c48 100644 --- a/htroot/cytag.java +++ b/htroot/cytag.java @@ -28,8 +28,6 @@ import java.awt.Image; import java.io.File; import java.io.IOException; -import java.util.Date; - import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.protocol.HeaderFramework; @@ -52,7 +50,7 @@ public class cytag { // harvest request information StringBuilder connect = new StringBuilder(); connect.append('{'); - appendJSON(connect, "time", GenericFormatter.SHORT_MILSEC_FORMATTER.format(new Date())); + appendJSON(connect, "time", GenericFormatter.SHORT_MILSEC_FORMATTER.format()); appendJSON(connect, "trail", (referer == null) ? "" : referer.toNormalform(false, false)); appendJSON(connect, "nick", (post == null) ? "" : post.get("nick", "")); appendJSON(connect, "tag", (post == null) ? "" : post.get("tag", "")); diff --git a/htroot/yacy/query.java b/htroot/yacy/query.java index 714193d54..de0721d02 100644 --- a/htroot/yacy/query.java +++ b/htroot/yacy/query.java @@ -28,8 +28,6 @@ // if the shell's current path is HTROOT import java.io.IOException; -import java.util.Date; - import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; @@ -75,7 +73,7 @@ public final class query { final String obj = post.get("object", ""); // keyword for query subject final String env = post.get("env", ""); // argument to query - prop.put("mytime", GenericFormatter.SHORT_SECOND_FORMATTER.format(new Date())); + prop.put("mytime", GenericFormatter.SHORT_SECOND_FORMATTER.format()); // check if we are the right target and requester has correct information about this peer if (sb.peers.mySeed() == null || !sb.peers.mySeed().hash.equals(youare)) { diff --git a/source/de/anomic/data/BlogBoard.java b/source/de/anomic/data/BlogBoard.java index 2b96de55a..e137209fc 100644 --- a/source/de/anomic/data/BlogBoard.java +++ b/source/de/anomic/data/BlogBoard.java @@ -434,7 +434,7 @@ public class BlogBoard { if (Log.isFinest("Blog")) { Log.logFinest("Blog", "ERROR: date field missing in blogBoard"); } - return GenericFormatter.SHORT_SECOND_FORMATTER.format(new Date()); + return GenericFormatter.SHORT_SECOND_FORMATTER.format(); } return timestamp; } diff --git a/source/de/anomic/data/WorkTables.java b/source/de/anomic/data/WorkTables.java index 1b215980f..50ca0b308 100644 --- a/source/de/anomic/data/WorkTables.java +++ b/source/de/anomic/data/WorkTables.java @@ -124,7 +124,7 @@ public class WorkTables extends Tables { Data data = new Data(); data.put(TABLE_API_COL_TYPE, type.getBytes()); data.put(TABLE_API_COL_COMMENT, comment.getBytes()); - byte[] date = GenericFormatter.SHORT_MILSEC_FORMATTER.format(new Date()).getBytes(); + byte[] date = GenericFormatter.SHORT_MILSEC_FORMATTER.format().getBytes(); data.put(TABLE_API_COL_DATE_RECORDING, date); data.put(TABLE_API_COL_DATE_LAST_EXEC, date); data.put(TABLE_API_COL_URL, apiurl.getBytes()); @@ -136,7 +136,7 @@ public class WorkTables extends Tables { // modify and update existing entry // modify date attributes and patch old values - row.put(TABLE_API_COL_DATE_LAST_EXEC, GenericFormatter.SHORT_MILSEC_FORMATTER.format(new Date()).getBytes()); + row.put(TABLE_API_COL_DATE_LAST_EXEC, GenericFormatter.SHORT_MILSEC_FORMATTER.format().getBytes()); if (!row.containsKey(TABLE_API_COL_DATE_RECORDING)) row.put(TABLE_API_COL_DATE_RECORDING, row.get(TABLE_API_COL_DATE)); row.remove(TABLE_API_COL_DATE); @@ -185,7 +185,7 @@ public class WorkTables extends Tables { Data data = new Data(); data.put(TABLE_API_COL_TYPE, type.getBytes()); data.put(TABLE_API_COL_COMMENT, comment.getBytes()); - byte[] date = GenericFormatter.SHORT_MILSEC_FORMATTER.format(new Date()).getBytes(); + byte[] date = GenericFormatter.SHORT_MILSEC_FORMATTER.format().getBytes(); data.put(TABLE_API_COL_DATE_RECORDING, date); data.put(TABLE_API_COL_DATE_LAST_EXEC, date); data.put(TABLE_API_COL_URL, apiurl.getBytes()); @@ -309,7 +309,7 @@ public class WorkTables extends Tables { try { // create and insert new entry Data data = new Data(); - byte[] date = GenericFormatter.SHORT_MILSEC_FORMATTER.format(new Date()).getBytes(); + byte[] date = GenericFormatter.SHORT_MILSEC_FORMATTER.format().getBytes(); data.put(TABLE_SEARCH_FAILURE_COL_URL, url.toNormalform(true, false)); data.put(TABLE_SEARCH_FAILURE_COL_DATE, date); data.put(TABLE_SEARCH_FAILURE_COL_WORDS, queryHashes.export()); diff --git a/source/de/anomic/http/server/HTTPDFileHandler.java b/source/de/anomic/http/server/HTTPDFileHandler.java index 679c20c2e..450261921 100644 --- a/source/de/anomic/http/server/HTTPDFileHandler.java +++ b/source/de/anomic/http/server/HTTPDFileHandler.java @@ -828,7 +828,7 @@ public final class HTTPDFileHandler { templatePatterns.put(servletProperties.PEER_STAT_UPTIME, ((System.currentTimeMillis() - serverCore.startupTime) / 1000) / 60); // uptime in minutes templatePatterns.putHTML(servletProperties.PEER_STAT_CLIENTNAME, sb.peers.mySeed().getName()); templatePatterns.putHTML(servletProperties.PEER_STAT_CLIENTID, ((Switchboard) switchboard).peers.myID()); - templatePatterns.put(servletProperties.PEER_STAT_MYTIME, GenericFormatter.SHORT_SECOND_FORMATTER.format(new Date())); + templatePatterns.put(servletProperties.PEER_STAT_MYTIME, GenericFormatter.SHORT_SECOND_FORMATTER.format()); yacySeed myPeer = sb.peers.mySeed(); templatePatterns.put("newpeer", myPeer.getAge() >= 1 ? 0 : 1); templatePatterns.putHTML("newpeer_peerhash", myPeer.hash); diff --git a/source/de/anomic/search/AccessTracker.java b/source/de/anomic/search/AccessTracker.java index f239dab06..febdefa14 100644 --- a/source/de/anomic/search/AccessTracker.java +++ b/source/de/anomic/search/AccessTracker.java @@ -26,7 +26,6 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.RandomAccessFile; import java.util.ArrayList; -import java.util.Date; import java.util.Iterator; import java.util.LinkedList; @@ -85,7 +84,7 @@ public class AccessTracker { //if (query.resultcount == 0) return; if (query.queryString == null || query.queryString.length() == 0) return; StringBuilder sb = new StringBuilder(40); - sb.append(GenericFormatter.SHORT_SECOND_FORMATTER.format(new Date())); + sb.append(GenericFormatter.SHORT_SECOND_FORMATTER.format()); sb.append(' '); sb.append(Integer.toString(query.resultcount)); sb.append(' '); diff --git a/source/de/anomic/yacy/graphics/WebStructureGraph.java b/source/de/anomic/yacy/graphics/WebStructureGraph.java index bd327a524..18dfa9af2 100644 --- a/source/de/anomic/yacy/graphics/WebStructureGraph.java +++ b/source/de/anomic/yacy/graphics/WebStructureGraph.java @@ -150,7 +150,7 @@ public class WebStructureGraph { private static String map2refstr(final Map map) { final StringBuilder s = new StringBuilder(map.size() * 10); - s.append(GenericFormatter.SHORT_DAY_FORMATTER.format(new Date())); + s.append(GenericFormatter.SHORT_DAY_FORMATTER.format()); String h; for (final Map.Entry entry : map.entrySet()) { s.append(entry.getKey()); @@ -229,7 +229,7 @@ public class WebStructureGraph { return new structureEntry( domhash, host, - GenericFormatter.SHORT_DAY_FORMATTER.format(new Date()), + GenericFormatter.SHORT_DAY_FORMATTER.format(), domhashes); } diff --git a/source/de/anomic/yacy/yacyCore.java b/source/de/anomic/yacy/yacyCore.java index 5cbf743b7..f3de3e585 100644 --- a/source/de/anomic/yacy/yacyCore.java +++ b/source/de/anomic/yacy/yacyCore.java @@ -212,7 +212,7 @@ public class yacyCore { } // use our own formatter to prevent concurrency locks with other processes - private final static GenericFormatter my_SHORT_SECOND_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_SECOND); + private final static GenericFormatter my_SHORT_SECOND_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_SECOND, GenericFormatter.time_second); protected class publishThread extends Thread { int added; diff --git a/source/de/anomic/yacy/yacyNetwork.java b/source/de/anomic/yacy/yacyNetwork.java index 2cea07401..54f0fdde6 100644 --- a/source/de/anomic/yacy/yacyNetwork.java +++ b/source/de/anomic/yacy/yacyNetwork.java @@ -27,7 +27,6 @@ package de.anomic.yacy; -import java.util.Date; import java.util.LinkedHashMap; import net.yacy.cora.date.GenericFormatter; @@ -93,7 +92,7 @@ public class yacyNetwork { } // use our own formatter to prevent concurrency locks with other processes - private final static GenericFormatter my_SHORT_SECOND_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_SECOND); + private final static GenericFormatter my_SHORT_SECOND_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_SECOND, GenericFormatter.time_second); public static final LinkedHashMap basicRequestParts(String myHash, String targetHash, String networkName) { // put in all the essentials for routing and network authentication @@ -106,7 +105,7 @@ public class yacyNetwork { if (targetHash != null) parts.put("youare", UTF8.StringBody(targetHash)); // time information for synchronization - parts.put("mytime", UTF8.StringBody(my_SHORT_SECOND_FORMATTER.format(new Date()))); + parts.put("mytime", UTF8.StringBody(my_SHORT_SECOND_FORMATTER.format())); parts.put("myUTC", UTF8.StringBody(Long.toString(System.currentTimeMillis()))); // network identification diff --git a/source/de/anomic/yacy/yacyNewsDB.java b/source/de/anomic/yacy/yacyNewsDB.java index 494f63153..0590519c0 100644 --- a/source/de/anomic/yacy/yacyNewsDB.java +++ b/source/de/anomic/yacy/yacyNewsDB.java @@ -159,7 +159,7 @@ public class yacyNewsDB { } // use our own formatter to prevent concurrency locks with other processes - private final static GenericFormatter my_SHORT_SECOND_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_SECOND); + private final static GenericFormatter my_SHORT_SECOND_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_SECOND, GenericFormatter.time_second); private Record b2r(final Row.Entry b) { if (b == null) return null; diff --git a/source/de/anomic/yacy/yacyNewsQueue.java b/source/de/anomic/yacy/yacyNewsQueue.java index 78a4c558c..64f1e2ff7 100644 --- a/source/de/anomic/yacy/yacyNewsQueue.java +++ b/source/de/anomic/yacy/yacyNewsQueue.java @@ -46,7 +46,6 @@ package de.anomic.yacy; import java.io.File; import java.io.IOException; -import java.util.Date; import java.util.HashSet; import java.util.Iterator; @@ -169,7 +168,7 @@ public class yacyNewsQueue { newsDB.put(r); final Row.Entry b = queueStack.row().newEntry(new byte[][]{ r.id().getBytes(), - GenericFormatter.SHORT_SECOND_FORMATTER.format(new Date()).getBytes()}); + GenericFormatter.SHORT_SECOND_FORMATTER.format().getBytes()}); return b; } diff --git a/source/de/anomic/yacy/yacySeed.java b/source/de/anomic/yacy/yacySeed.java index 7f87f98eb..8deb3d32b 100644 --- a/source/de/anomic/yacy/yacySeed.java +++ b/source/de/anomic/yacy/yacySeed.java @@ -185,7 +185,7 @@ public class yacySeed implements Cloneable, Comparable, Comparator(); @@ -728,7 +728,7 @@ public class yacySeed implements Cloneable, Comparable, Comparator, Comparator { // can be detected with given expiration date Date expiration = getExpirationDate(); if (expiration != null) { - if (expiration.before(new Date())) throw new IOException("the resumption is expired at " + ISO8601Formatter.FORMATTER.format(expiration) + " (now: " + ISO8601Formatter.FORMATTER.format(new Date())); + if (expiration.before(new Date())) throw new IOException("the resumption is expired at " + ISO8601Formatter.FORMATTER.format(expiration) + " (now: " + ISO8601Formatter.FORMATTER.format()); // the resumption token is still fresh } String u = url + "verb=ListRecords&resumptionToken=" + escape(token); diff --git a/source/net/yacy/kelondro/blob/ArrayStack.java b/source/net/yacy/kelondro/blob/ArrayStack.java index 9648463ff..9adf8f5a6 100755 --- a/source/net/yacy/kelondro/blob/ArrayStack.java +++ b/source/net/yacy/kelondro/blob/ArrayStack.java @@ -98,7 +98,7 @@ public class ArrayStack implements BLOB { private final ExecutorService executor; // use our own formatter to prevent concurrency locks with other processes - private final static GenericFormatter my_SHORT_MILSEC_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_MILSEC); + private final static GenericFormatter my_SHORT_MILSEC_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_MILSEC, 1); public ArrayStack( diff --git a/source/net/yacy/kelondro/blob/MapHeap.java b/source/net/yacy/kelondro/blob/MapHeap.java index 1b8c590ce..278e0b3a2 100644 --- a/source/net/yacy/kelondro/blob/MapHeap.java +++ b/source/net/yacy/kelondro/blob/MapHeap.java @@ -33,7 +33,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.util.Collection; -import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -130,7 +129,7 @@ public class MapHeap implements Map> { // use our own formatter to prevent concurrency locks with other processes - private final static GenericFormatter my_SHORT_SECOND_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_SECOND); + private final static GenericFormatter my_SHORT_SECOND_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_SECOND, GenericFormatter.time_second); /** * write a whole byte array as Map to the table @@ -144,7 +143,7 @@ public class MapHeap implements Map> { assert key.length > 0; assert newMap != null; key = normalizeKey(key); - String s = map2string(newMap, "W" + my_SHORT_SECOND_FORMATTER.format(new Date()) + " "); + String s = map2string(newMap, "W" + my_SHORT_SECOND_FORMATTER.format() + " "); assert s != null; byte[] sb = s.getBytes(); synchronized (this) { diff --git a/source/net/yacy/kelondro/blob/Tables.java b/source/net/yacy/kelondro/blob/Tables.java index d6f3b4e1d..85a362a34 100644 --- a/source/net/yacy/kelondro/blob/Tables.java +++ b/source/net/yacy/kelondro/blob/Tables.java @@ -61,7 +61,7 @@ public class Tables { int keymaxlen; // use our own formatter to prevent concurrency locks with other processes - private final static GenericFormatter my_SHORT_MILSEC_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_MILSEC); + private final static GenericFormatter my_SHORT_MILSEC_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_MILSEC, 1); public Tables(final File location, final int keymaxlen) { this.location = new File(location.getAbsolutePath()); diff --git a/source/net/yacy/kelondro/data/meta/URIMetadataRow.java b/source/net/yacy/kelondro/data/meta/URIMetadataRow.java index 908944df1..c5683eb1f 100644 --- a/source/net/yacy/kelondro/data/meta/URIMetadataRow.java +++ b/source/net/yacy/kelondro/data/meta/URIMetadataRow.java @@ -106,7 +106,7 @@ public class URIMetadataRow implements URIMetadata { private final long ranking; // during generation of a search result this value is set private Components comp; - private static final GenericFormatter mySHORT_DAY_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_DAY); + private static final GenericFormatter mySHORT_DAY_FORMATTER = new GenericFormatter(GenericFormatter.FORMAT_SHORT_DAY, GenericFormatter.time_minute); public URIMetadataRow() { // create a dummy entry, good to produce poison objects diff --git a/source/net/yacy/kelondro/table/SplitTable.java b/source/net/yacy/kelondro/table/SplitTable.java index fa1259e0e..dc85b5caa 100644 --- a/source/net/yacy/kelondro/table/SplitTable.java +++ b/source/net/yacy/kelondro/table/SplitTable.java @@ -136,7 +136,7 @@ public class SplitTable implements Index, Iterable { } private String newFilename() { - return prefix + "." + GenericFormatter.SHORT_MILSEC_FORMATTER.format(new Date()) + ".table"; + return prefix + "." + GenericFormatter.SHORT_MILSEC_FORMATTER.format() + ".table"; } private void init() throws RowSpaceExceededException {