Merge branch 'move-class-CurrentTimeUTC' into master

= Move class CurrentTimeUTC from fred to Freetalk

The fred developers recently revamped the class, and then decided
to deprecate the class in fred, hence Freetalk (and WoT) will have to
contain it so it can be removed there.

This branch only moves the class as it was before the modifications.
I did not include these modifications yet because there is no unit test
and I have no time to write one and also not to review the changes.

A bugtracker issue has been filed to document that the modifications
will have to be applied:
https://bugs.freenetproject.org/view.php?id=7205

src/plugins/Freetalk/FetchFailedMarker.java

@@ -5,7 +5,7 @@
 
 import java.util.Date;
 
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 
 /**
  * When a message (list) fetch fails we need to mark the message (list) as fetched to prevent the failed message (list) from getting into the

src/plugins/Freetalk/MessageManager.java

@@ -42,7 +42,7 @@
 import freenet.keys.FreenetURI;
 import freenet.node.PrioRunnable;
 import freenet.pluginmanager.PluginRespirator;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.Logger;
 import freenet.support.TrivialTicker;
 import freenet.support.io.NativeThread;

src/plugins/Freetalk/Persistent.java

@@ -19,7 +19,7 @@
 import com.db4o.ext.ObjectInfo;
 import com.db4o.query.Query;
 
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.Logger;
 /**
  * ATTENTION: This class is duplicated in the Web Of Trust plugin. Backport any changes!

src/plugins/Freetalk/SubscribedBoard.java

@@ -14,7 +14,7 @@
 import com.db4o.ext.ExtObjectContainer;
 import com.db4o.query.Query;
 
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.Logger;
 import freenet.support.codeshortification.IfNotEquals;
 import freenet.support.codeshortification.IfNull;

src/plugins/Freetalk/WoT/WoTIdentityManager.java

@@ -36,7 +36,7 @@
 import freenet.node.PrioRunnable;
 import freenet.pluginmanager.PluginNotFoundException;
 import freenet.support.Base64;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.Executor;
 import freenet.support.IllegalBase64Exception;
 import freenet.support.LRUCache;

src/plugins/Freetalk/WoT/WoTMessageManager.java

@@ -40,7 +40,7 @@
 import freenet.keys.FreenetURI;
 import freenet.node.RequestClient;
 import freenet.pluginmanager.PluginRespirator;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.Logger;
 
 public final class WoTMessageManager extends MessageManager {

src/plugins/Freetalk/tasks/NewBoardTask.java

@@ -9,7 +9,7 @@
 import plugins.Freetalk.exceptions.NoSuchBoardException;
 import plugins.Freetalk.ui.web.WebInterface;
 import plugins.Freetalk.ui.web.WebPage;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.Logger;
 import freenet.support.codeshortification.IfNull;
 

src/plugins/Freetalk/tasks/PersistentTask.java

@@ -10,7 +10,7 @@
 import plugins.Freetalk.exceptions.NoSuchIdentityException;
 import plugins.Freetalk.ui.web.WebInterface;
 import plugins.Freetalk.ui.web.WebPage;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.codeshortification.IfNull;
 
 /**

src/plugins/Freetalk/tasks/PersistentTaskManager.java

@@ -20,7 +20,7 @@
 import com.db4o.query.Query;
 
 import freenet.node.PrioRunnable;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.Logger;
 import freenet.support.TrivialTicker;
 import freenet.support.codeshortification.IfNull;

src/plugins/Freetalk/tasks/SubscribeToAllBoardsTask.java

@@ -7,7 +7,7 @@
 import plugins.Freetalk.OwnIdentity;
 import plugins.Freetalk.ui.web.WebInterface;
 import plugins.Freetalk.ui.web.WebPage;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.codeshortification.IfNull;
 
 /**

src/plugins/Freetalk/tasks/WoT/IntroduceIdentityTask.java

@@ -14,7 +14,7 @@
 import plugins.Freetalk.ui.web.IntroduceIdentityPage;
 import plugins.Freetalk.ui.web.WebInterface;
 import plugins.Freetalk.ui.web.WebPage;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.Logger;
 import freenet.support.codeshortification.IfNotEquals;
 

src/plugins/Freetalk/ui/NNTP/FreetalkNNTPHandler.java

@@ -34,7 +34,7 @@
 import plugins.Freetalk.exceptions.NoSuchBoardException;
 import plugins.Freetalk.exceptions.NoSuchIdentityException;
 import plugins.Freetalk.exceptions.NoSuchMessageException;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 import freenet.support.Logger;
 
 /**

src/plugins/Freetalk/util/CurrentTimeUTC.java

@@ -0,0 +1,63 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+package plugins.Freetalk.util;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+
+/**
+ * A wrapper class around a GregorianCalendar which always returns the current time.
+ * This is useful for working around the pitfall of class Calendar: It only returns the current time when you first use a get*() function,
+ * in any get*() calls after the first call, the time value of the first call is returned. One would have to call Calendar.clear() before each
+ * get to obtain the current time and this class takes care of that for you.
+ * 
+ * Further, this class is synchronized so you do not need to worry about synchronization of a Calendar anymore.
+ */
+public class CurrentTimeUTC {
+
+	private static final GregorianCalendar mCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+
+	public static Date get() {
+		synchronized(mCalendar) {
+			mCalendar.setTimeInMillis(System.currentTimeMillis());
+			return mCalendar.getTime();
+		}
+	}
+
+	/**
+	 * Get the current time in milliseconds. 
+	 * 
+	 * In the current implementation, this just returns System.currentTimeMilis(). You should however use CurrenTimeUTC.getInMillis() instead because
+	 * the JavaDoc of System.currentTimeMilis() does not explicitly state what time zone it returns. Therefore, by using this wrapper function, your code
+	 * clearly states that it uses UTC time. 
+	 */
+	public static long getInMillis() {
+		return System.currentTimeMillis();
+	}
+
+	public static int getYear() {
+		synchronized(mCalendar) {
+			mCalendar.setTimeInMillis(System.currentTimeMillis());
+			return mCalendar.get(Calendar.YEAR);
+		}
+	}
+
+	public static int getMonth() {
+		synchronized(mCalendar) {
+			mCalendar.setTimeInMillis(System.currentTimeMillis());
+			return mCalendar.get(Calendar.MONTH);
+		}
+	}
+
+	public static int getDayOfMonth() {
+		synchronized(mCalendar) {
+			mCalendar.setTimeInMillis(System.currentTimeMillis());
+			return mCalendar.get(Calendar.DAY_OF_MONTH);
+		}
+	}
+
+}

test/plugins/Freetalk/WoT/WoTMessageManagerTest.java

@@ -35,7 +35,7 @@
 import com.db4o.query.Query;
 
 import freenet.keys.FreenetURI;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 
 
 public class WoTMessageManagerTest extends DatabaseBasedTest {

test/plugins/Freetalk/WoT/WoTMessageXMLTest.java

@@ -24,7 +24,7 @@
 import plugins.Freetalk.Version;
 import plugins.Freetalk.util.MimeType;
 import freenet.keys.FreenetURI;
-import freenet.support.CurrentTimeUTC;
+import plugins.Freetalk.util.CurrentTimeUTC;
 
 
 public class WoTMessageXMLTest extends DatabaseBasedTest {