Author: zothar
Date: 2006-05-29 00:14:16 +0000 (Mon, 29 May 2006)
New Revision: 8907
Modified:
trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
trunk/freenet/src/freenet/node/useralerts/UserAlert.java
trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
Log:
N2NTM code update: namely basic reply function added. Again, feel free to
theme.
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2006-05-28
22:27:14 UTC (rev 8906)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2006-05-29
00:14:16 UTC (rev 8907)
@@ -144,6 +144,16 @@
}
try {
Message n2ntm =
DMT.createNodeToNodeTextMessage(Node.N2N_TEXT_MESSAGE_TYPE_USERALERT,
node.getMyName(), pn.getName(), message);
+ String messageTextBuf = HTMLEncoder.encode(message);
+ int j = messageTextBuf.length();
+ StringBuffer messageTextBuf2 = new StringBuffer(j);
+ for (int i = 0; i < j; i++) {
+ char ch = messageTextBuf.charAt(i);
+ if(ch == '\n')
+ messageTextBuf2.append("<br />");
+ else
+ messageTextBuf2.append(ch);
+ }
if(pn == null) {
ctx.getPageMaker().makeHead(buf, "Node To Node Text Message Failed");
@@ -178,7 +188,7 @@
usm.send(pn, n2ntm);
- buf.append("Message should be on it's way.<br /><br />\n");
+ buf.append("Message should be on it's way:<hr /><br /><br
/>"+messageTextBuf2+"<br /><br />\n");
buf.append("</div>");
buf.append("</div>");
} else {
@@ -193,7 +203,7 @@
usm.send(pn, n2ntm);
- buf.append("Message should be on it's way.<br /><br />\n");
+ buf.append("Message should be on it's way:<hr /><br /><br
/>"+messageTextBuf2+"<br /><br />\n");
buf.append("</div>");
buf.append("</div>");
}
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-05-28 22:27:14 UTC (rev
8906)
+++ trunk/freenet/src/freenet/node/Node.java 2006-05-29 00:14:16 UTC (rev
8907)
@@ -2902,7 +2902,7 @@
String target_nodename = (String) m.getObject(DMT.TARGET_NODENAME);
String text = (String) m.getObject(DMT.NODE_TO_NODE_MESSAGE_TEXT);
Logger.normal(this, "Received N2NTM from '"+source_nodename+"' to
'"+target_nodename+"': "+text);
- N2NTMUserAlert userAlert = new N2NTMUserAlert(source_nodename,
target_nodename, text);
+ N2NTMUserAlert userAlert = new N2NTMUserAlert(source, source_nodename,
target_nodename, text);
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/BuildOldAgeUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
2006-05-28 22:27:14 UTC (rev 8906)
+++ trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
2006-05-29 00:14:16 UTC (rev 8907)
@@ -36,4 +36,8 @@
public void isValid(boolean b){
if(userCanDismiss()) isValid=b;
}
+
+ public String dismissButtonText(){
+ return "Hide";
+ }
}
Modified: trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
2006-05-28 22:27:14 UTC (rev 8906)
+++ trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
2006-05-29 00:14:16 UTC (rev 8907)
@@ -30,4 +30,8 @@
public void isValid(boolean validity){
if(userCanDismiss()) isValid=validity;
}
+
+ public String dismissButtonText(){
+ return "Hide";
+ }
}
Modified:
trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
2006-05-28 22:27:14 UTC (rev 8906)
+++ trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
2006-05-29 00:14:16 UTC (rev 8907)
@@ -31,4 +31,8 @@
public void isValid(boolean b){
if(userCanDismiss()) isValid=b;
}
+
+ public String dismissButtonText(){
+ return "Hide";
+ }
}
Modified: trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
2006-05-28 22:27:14 UTC (rev 8906)
+++ trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
2006-05-29 00:14:16 UTC (rev 8907)
@@ -1,19 +1,21 @@
package freenet.node.useralerts;
+import freenet.node.PeerNode;
import freenet.support.HTMLEncoder;
// Node To Node Text Message User Alert
public class N2NTMUserAlert implements UserAlert {
private boolean isValid=true;
- public int lastGoodVersion = 0;
- private String source_nodename;
- private String target_nodename;
- private String message_text;
+ private PeerNode sourcePeerNode;
+ private String sourceNodename;
+ private String targetNodename;
+ private String messageText;
- public N2NTMUserAlert(String source, String target, String message) {
- this.source_nodename = source;
- this.target_nodename = target;
- this.message_text = message;
+ public N2NTMUserAlert(PeerNode sourcePeerNode, String source, String
target, String message) {
+ this.sourcePeerNode = sourcePeerNode;
+ this.sourceNodename = source;
+ this.targetNodename = target;
+ this.messageText = message;
isValid=true;
}
@@ -26,8 +28,19 @@
}
public String getText() {
+ String messageTextBuf = HTMLEncoder.encode(messageText);
+ int j = messageTextBuf.length();
+ StringBuffer messageTextBuf2 = new StringBuffer(j);
+ for (int i = 0; i < j; i++) {
+ char ch = messageTextBuf.charAt(i);
+ if(ch == '\n')
+ messageTextBuf2.append("<br />");
+ else
+ messageTextBuf2.append(ch);
+ }
+ String replyString = "<a
href=\"/send_n2ntm/?peernode_hashcode="+sourcePeerNode.hashCode()+"\">Reply</a><br
/><br />";
String s;
- s = "You, as nodename
'"+HTMLEncoder.encode(target_nodename)+"', have received a node to node text
message from nodename '"+HTMLEncoder.encode(source_nodename)+"':<br /><br
/>"+HTMLEncoder.encode(message_text);
+ s = "From: <"+HTMLEncoder.encode(sourceNodename)+"><br
/>To: <"+HTMLEncoder.encode(targetNodename)+"><hr /><br /><br
/>"+messageTextBuf2+"<br /><br />"+replyString;
return s;
}
@@ -42,4 +55,8 @@
public void isValid(boolean b){
if(userCanDismiss()) isValid=b;
}
+
+ public String dismissButtonText(){
+ return "Delete";
+ }
}
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2006-05-28 22:27:14 UTC (rev 8906)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2006-05-29 00:14:16 UTC (rev 8907)
@@ -69,4 +69,8 @@
public void isValid(boolean b){
if(userCanDismiss()) isValid=b;
}
+
+ public String dismissButtonText(){
+ return "Hide";
+ }
}
Modified:
trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java
2006-05-28 22:27:14 UTC (rev 8906)
+++ trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java
2006-05-29 00:14:16 UTC (rev 8907)
@@ -36,4 +36,8 @@
public void isValid(boolean b){
// We ignore it : it's ALWAYS valid !
}
+
+ public String dismissButtonText(){
+ return "Hide";
+ }
}
Modified:
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-05-28 22:27:14 UTC (rev 8906)
+++
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-05-29 00:14:16 UTC (rev 8907)
@@ -39,4 +39,8 @@
public void isValid(boolean b){
isValid=b;
}
+
+ public String dismissButtonText(){
+ return "Hide";
+ }
}
Modified: trunk/freenet/src/freenet/node/useralerts/UserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlert.java 2006-05-28
22:27:14 UTC (rev 8906)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlert.java 2006-05-29
00:14:16 UTC (rev 8907)
@@ -31,6 +31,8 @@
public void isValid(boolean validity);
+ public String dismissButtonText();
+
/** An error which prevents normal operation */
public final static short CRITICAL_ERROR = 0;
/** An error which prevents normal operation but might be temporary */
Modified: trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
2006-05-28 22:27:14 UTC (rev 8906)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
2006-05-29 00:14:16 UTC (rev 8907)
@@ -69,7 +69,7 @@
//
if(a[i].userCanDismiss())
buf.append("<form method=\"post\"
action=\".\"><input type=\"hidden\" name=\"disable\" value=\""+
- a[i].hashCode()+"\"
/><input type=\"submit\" value=\"Hide\" /></form>");
+ a[i].hashCode()+"\"
/><input type=\"submit\" value=\""+a[i].dismissButtonText()+"\" /></form>");
//
buf.append("</div>\n");
buf.append("</div>\n");
