[freenet-cvs] r11551 - in trunk/freenet/src/freenet/node: . useralerts

[zothar at freenetproject.org]

Author: zothar
Date: 2007-01-03 05:44:28 +0000 (Wed, 03 Jan 2007)
New Revision: 11551

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
Log:
Add compose/send/receive times to N2NTM user alert display

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java	2007-01-03 04:34:29 UTC (rev 11550)
+++ trunk/freenet/src/freenet/node/Node.java	2007-01-03 05:44:28 UTC (rev 11551)
@@ -2975,15 +2975,21 @@
 		String source_nodename = null;
 		String target_nodename = null;
 		String text = null;
+		long composedTime = -1;
+		long sentTime = -1;
+		long receivedTime = -1;
 	  	try {
 			source_nodename = new String(Base64.decode(fs.get("source_nodename")));
 			target_nodename = new String(Base64.decode(fs.get("target_nodename")));
 			text = new String(Base64.decode(fs.get("text")));
+			composedTime = fs.getLong("composedTime", -1);
+			sentTime = fs.getLong("sentTime", -1);
+			receivedTime = fs.getLong("receivedTime", -1);
 		} catch (IllegalBase64Exception e) {
 			Logger.error(this, "Bad Base64 encoding when decoding a N2NTM SimpleFieldSet", e);
 			return;
 		}
-		N2NTMUserAlert userAlert = new N2NTMUserAlert(source, source_nodename, target_nodename, text, fileNumber);
+		N2NTMUserAlert userAlert = new N2NTMUserAlert(source, source_nodename, target_nodename, text, fileNumber, composedTime, sentTime, receivedTime);
 			clientCore.alerts.register(userAlert);
 	  } else {
 		Logger.error(this, "Received unknown node to node message type '"+type+"' from "+source.getPeer());

Modified: trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java	2007-01-03 04:34:29 UTC (rev 11550)
+++ trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java	2007-01-03 05:44:28 UTC (rev 11551)
@@ -3,6 +3,9 @@
  * http://www.gnu.org/ for further details of the GPL. */
 package freenet.node.useralerts;
 
+import java.text.DateFormat;
+import java.util.Date;
+
 import freenet.node.PeerNode;
 import freenet.support.HTMLEncoder;
 import freenet.support.HTMLNode;
@@ -15,13 +18,19 @@
 	private String targetNodename;
 	private String messageText;
 	private int fileNumber;
+	private long composedTime;
+	private long sentTime;
+	private long receivedTime;
 
-	public N2NTMUserAlert(PeerNode sourcePeerNode, String source, String target, String message, int fileNumber) {
-	  this.sourcePeerNode = sourcePeerNode;
+	public N2NTMUserAlert(PeerNode sourcePeerNode, String source, String target, String message, int fileNumber, long composedTime, long  sentTime, long receivedTime) {
+		this.sourcePeerNode = sourcePeerNode;
 		this.sourceNodename = source;
 		this.targetNodename = target;
 		this.messageText = message;
 		this.fileNumber = fileNumber;
+		this.composedTime = composedTime;
+		this.sentTime = sentTime;
+		this.receivedTime = receivedTime;
 		isValid=true;
 	}
 	
@@ -52,7 +61,7 @@
 
 	public HTMLNode getHTMLText() {
 		HTMLNode alertNode = new HTMLNode("div");
-		alertNode.addChild("p", "From: " + sourceNodename);
+		alertNode.addChild("p", "From: " + sourceNodename + " (composed: " + DateFormat.getInstance().format(new Date(composedTime)) + "/sent: " + DateFormat.getInstance().format(new Date(sentTime)) + "/received: " + DateFormat.getInstance().format(new Date(receivedTime)) + ')');
 		String[] lines = messageText.split("\n");
 		for (int i = 0, c = lines.length; i < c; i++) {
 			alertNode.addChild("div", lines[i]);