Author: toad
Date: 2007-06-01 14:41:13 +0000 (Fri, 01 Jun 2007)
New Revision: 13440
Modified:
trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
Log:
Indenting
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2007-06-01
12:24:15 UTC (rev 13439)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2007-06-01
14:41:13 UTC (rev 13440)
@@ -27,120 +27,147 @@
public class N2NTMToadlet extends Toadlet {
- private Node node;
- private NodeClientCore core;
- private UdpSocketManager usm;
-
- protected N2NTMToadlet(Node n, NodeClientCore core, HighLevelSimpleClient
client) {
- super(client);
- this.node = n;
- this.core = core;
- this.usm = n.getUSM();
- }
+ private Node node;
- public String supportedMethods() {
- return "GET, POST";
- }
+ private NodeClientCore core;
- public void handleGet(URI uri, HTTPRequest request, ToadletContext ctx)
throws ToadletContextClosedException, IOException, RedirectException {
-
- if(!ctx.isAllowedFullAccess()) {
- super.sendErrorPage(ctx, 403, "Unauthorized",
L10n.getString("Toadlet.unauthorized"));
- return;
- }
-
- if (request.isParameterSet("peernode_hashcode")) {
- HTMLNode pageNode =
ctx.getPageMaker().getPageNode(l10n("sendMessage"), ctx);
- HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
-
- String peernode_name = null;
- String input_hashcode_string =
request.getParam("peernode_hashcode");
- int input_hashcode = -1;
- try {
- input_hashcode = (new
Integer(input_hashcode_string)).intValue();
- } catch (NumberFormatException e) {
- // ignore here, handle below
- }
- if(input_hashcode != -1) {
- PeerNode[] peerNodes = node.getDarknetConnections();
- for(int i = 0; i < peerNodes.length; i++) {
- int peer_hashcode = peerNodes[i].hashCode();
- if(peer_hashcode == input_hashcode) {
- peernode_name =
peerNodes[i].getName();
- break;
- }
- }
- }
- if(peernode_name == null) {
-
contentNode.addChild(createPeerInfobox("infobox-error",
l10n("peerNotFoundTitle"), l10n("peerNotFoundWithHash", "hash",
input_hashcode_string)));
- this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
- return;
- }
+ private UdpSocketManager usm;
+
+ protected N2NTMToadlet(Node n, NodeClientCore core,
+ HighLevelSimpleClient client) {
+ super(client);
+ this.node = n;
+ this.core = core;
+ this.usm = n.getUSM();
+ }
+
+ public String supportedMethods() {
+ return "GET, POST";
+ }
+
+ public void handleGet(URI uri, HTTPRequest request, ToadletContext ctx)
+ throws ToadletContextClosedException, IOException,
+ RedirectException {
+
+ if (!ctx.isAllowedFullAccess()) {
+ super.sendErrorPage(ctx, 403, "Unauthorized", L10n
+ .getString("Toadlet.unauthorized"));
+ return;
+ }
+
+ if (request.isParameterSet("peernode_hashcode")) {
+ HTMLNode pageNode = ctx.getPageMaker().getPageNode(
+ l10n("sendMessage"), ctx);
+ HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
+
+ String peernode_name = null;
+ String input_hashcode_string = request
+ .getParam("peernode_hashcode");
+ int input_hashcode = -1;
+ try {
+ input_hashcode = (new
Integer(input_hashcode_string))
+ .intValue();
+ } catch (NumberFormatException e) {
+ // ignore here, handle below
+ }
+ if (input_hashcode != -1) {
+ PeerNode[] peerNodes =
node.getDarknetConnections();
+ for (int i = 0; i < peerNodes.length; i++) {
+ int peer_hashcode =
peerNodes[i].hashCode();
+ if (peer_hashcode == input_hashcode) {
+ peernode_name =
peerNodes[i].getName();
+ break;
+ }
+ }
+ }
+ if (peernode_name == null) {
+
contentNode.addChild(createPeerInfobox("infobox-error",
+ l10n("peerNotFoundTitle"),
l10n("peerNotFoundWithHash",
+ "hash",
input_hashcode_string)));
+ this.writeReply(ctx, 200, "text/html", "OK",
pageNode
+ .generate());
+ return;
+ }
HashMap peers = new HashMap();
- peers.put( input_hashcode_string, peernode_name );
- String resultString = createN2NTMSendForm( pageNode,
contentNode, ctx, peers);
- if(resultString != null) { // was there an error in
createN2NTMSendForm()?
+ peers.put(input_hashcode_string, peernode_name);
+ String resultString = createN2NTMSendForm(pageNode,
contentNode,
+ ctx, peers);
+ if (resultString != null) { // was there an error in
+
// createN2NTMSendForm()?
this.writeReply(ctx, 200, "text/html", "OK",
resultString);
return;
}
- this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
- return;
- }
- MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/friends/");
- ctx.sendReplyHeaders(302, "Found", headers, null, 0);
- }
-
- private String l10n(String key, String pattern, String value) {
- return L10n.getString("N2NTMToadlet."+key, new String[] { pattern },
new String[] { value });
- }
+ this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
+ return;
+ }
+ MultiValueTable headers = new MultiValueTable();
+ headers.put("Location", "/friends/");
+ ctx.sendReplyHeaders(302, "Found", headers, null, 0);
+ }
-private static String l10n(String key) {
- return L10n.getString("N2NTMToadlet."+key);
- }
+ private String l10n(String key, String pattern, String value) {
+ return L10n.getString("N2NTMToadlet." + key, new String[] {
pattern },
+ new String[] { value });
+ }
-private static HTMLNode createPeerInfobox(String infoboxType, String header,
String message) {
- HTMLNode infobox = new HTMLNode("div", "class", "infobox " +
infoboxType);
- infobox.addChild("div", "class", "infobox-header", header);
- HTMLNode infoboxContent = infobox.addChild("div", "class",
"infobox-content");
- infoboxContent.addChild("#", message);
- HTMLNode list = infoboxContent.addChild("ul");
- Toadlet.addHomepageLink(list);
- list.addChild("li").addChild("a", new String[] { "href", "title" },
new String[] { "/friends/", l10n("returnToFriends") }, l10n("friends"));
- return infobox;
- }
-
- public void handlePost(URI uri, HTTPRequest request, ToadletContext ctx)
throws ToadletContextClosedException, IOException, RedirectException {
- String pass = request.getPartAsString("formPassword", 32);
- if((pass == null) || !pass.equals(core.formPassword)) {
- MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/send_n2ntm/");
- ctx.sendReplyHeaders(302, "Found", headers, null, 0);
- return;
- }
-
- if(!ctx.isAllowedFullAccess()) {
- super.sendErrorPage(ctx, 403, "Unauthorized",
L10n.getString("Toadlet.unauthorized"));
- return;
- }
-
- if (request.isPartSet("send")) {
- String message = request.getPartAsString("message", 5*1024);
- message = message.trim();
- if(message.length() > 1024) {
- this.writeReply(ctx, 400, "text/plain",
l10n("tooLongTitle"), l10n("tooLong"));
+ private static String l10n(String key) {
+ return L10n.getString("N2NTMToadlet." + key);
+ }
+
+ private static HTMLNode createPeerInfobox(String infoboxType,
+ String header, String message) {
+ HTMLNode infobox = new HTMLNode("div", "class", "infobox "
+ + infoboxType);
+ infobox.addChild("div", "class", "infobox-header", header);
+ HTMLNode infoboxContent = infobox.addChild("div", "class",
+ "infobox-content");
+ infoboxContent.addChild("#", message);
+ HTMLNode list = infoboxContent.addChild("ul");
+ Toadlet.addHomepageLink(list);
+ list.addChild("li").addChild("a", new String[] { "href",
"title" },
+ new String[] { "/friends/",
l10n("returnToFriends") },
+ l10n("friends"));
+ return infobox;
+ }
+
+ public void handlePost(URI uri, HTTPRequest request, ToadletContext ctx)
+ throws ToadletContextClosedException, IOException,
+ RedirectException {
+ String pass = request.getPartAsString("formPassword", 32);
+ if ((pass == null) || !pass.equals(core.formPassword)) {
+ MultiValueTable headers = new MultiValueTable();
+ headers.put("Location", "/send_n2ntm/");
+ ctx.sendReplyHeaders(302, "Found", headers, null, 0);
+ return;
+ }
+
+ if (!ctx.isAllowedFullAccess()) {
+ super.sendErrorPage(ctx, 403, "Unauthorized", L10n
+ .getString("Toadlet.unauthorized"));
+ return;
+ }
+
+ if (request.isPartSet("send")) {
+ String message = request.getPartAsString("message", 5 *
1024);
+ message = message.trim();
+ if (message.length() > 1024) {
+ this.writeReply(ctx, 400, "text/plain",
l10n("tooLongTitle"),
+ l10n("tooLong"));
return;
}
- HTMLNode pageNode =
ctx.getPageMaker().getPageNode(l10n("processingSend"), ctx);
+ HTMLNode pageNode = ctx.getPageMaker().getPageNode(
+ l10n("processingSend"), ctx);
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
- HTMLNode peerTableInfobox = contentNode.addChild("div",
"class", "infobox infobox-normal");
- HTMLNode peerTable = peerTableInfobox.addChild("table",
"class", "n2ntm-send-statuses");
+ HTMLNode peerTableInfobox = contentNode.addChild("div",
"class",
+ "infobox infobox-normal");
+ HTMLNode peerTable = peerTableInfobox.addChild("table",
"class",
+ "n2ntm-send-statuses");
HTMLNode peerTableHeaderRow = peerTable.addChild("tr");
peerTableHeaderRow.addChild("th", l10n("peerName"));
peerTableHeaderRow.addChild("th", l10n("sendStatus"));
PeerNode[] peerNodes = node.getDarknetConnections();
- for(int i = 0; i < peerNodes.length; i++) {
- if
(request.isPartSet("node_"+peerNodes[i].hashCode())) {
+ for (int i = 0; i < peerNodes.length; i++) {
+ if (request.isPartSet("node_" +
peerNodes[i].hashCode())) {
PeerNode pn = peerNodes[i];
String sendStatusShort;
String sendStatusLong;
@@ -149,32 +176,39 @@
long now =
System.currentTimeMillis();
SimpleFieldSet fs = new
SimpleFieldSet(true);
fs.put("type",
Node.N2N_TEXT_MESSAGE_TYPE_USERALERT);
- fs.putSingle("source_nodename",
Base64.encode(node.getMyName().getBytes()));
- fs.putSingle("target_nodename",
Base64.encode(pn.getName().getBytes()));
+ fs.putSingle("source_nodename",
Base64.encode(node
+
.getMyName().getBytes()));
+ fs.putSingle("target_nodename",
Base64.encode(pn
+
.getName().getBytes()));
fs.putSingle("text",
Base64.encode(message.getBytes()));
fs.put("composedTime", now);
fs.put("sentTime", now);
Message n2ntm;
- n2ntm =
DMT.createNodeToNodeMessage(Node.N2N_TEXT_MESSAGE_TYPE_USERALERT,
fs.toString().getBytes("UTF-8"));
- if(!pn.isConnected()) {
+ n2ntm =
DMT.createNodeToNodeMessage(
+
Node.N2N_TEXT_MESSAGE_TYPE_USERALERT, fs
+
.toString().getBytes("UTF-8"));
+ if (!pn.isConnected()) {
sendStatusShort =
l10n("queuedTitle");
sendStatusLong =
l10n("queued");
sendStatusClass =
"n2ntm-send-queued";
fs.removeValue("sentTime");
pn.queueN2NTM(fs);
- Logger.normal(this,
"Queued N2NTM to '"+pn.getName()+"': "+message);
- } else
if(pn.getPeerNodeStatus() == PeerManager.PEER_NODE_STATUS_ROUTING_BACKED_OFF) {
+ Logger.normal(this,
"Queued N2NTM to '"
+ +
pn.getName() + "': " + message);
+ } else if
(pn.getPeerNodeStatus() == PeerManager.PEER_NODE_STATUS_ROUTING_BACKED_OFF) {
sendStatusShort =
l10n("delayedTitle");
sendStatusLong =
l10n("delayed");
sendStatusClass =
"n2ntm-send-delayed";
usm.send(pn, n2ntm,
null);
- Logger.normal(this,
"Sent N2NTM to '"+pn.getName()+"': "+message);
+ Logger.normal(this,
"Sent N2NTM to '"
+ +
pn.getName() + "': " + message);
} else {
sendStatusShort =
l10n("sentTitle");
sendStatusLong =
l10n("sent");
sendStatusClass =
"n2ntm-send-sent";
usm.send(pn, n2ntm,
null);
- Logger.normal(this,
"Sent N2NTM to '"+pn.getName()+"': "+message);
+ Logger.normal(this,
"Sent N2NTM to '"
+ +
pn.getName() + "': " + message);
}
} catch (NotConnectedException e) {
sendStatusShort =
l10n("failedTitle");
@@ -182,44 +216,65 @@
sendStatusClass =
"n2ntm-send-failed";
}
HTMLNode peerRow =
peerTable.addChild("tr");
- peerRow.addChild("td", "class",
"peer-name").addChild("#", pn.getName());
- peerRow.addChild("td", "class",
sendStatusClass).addChild("span", new String[] { "title", "style" }, new
String[] { sendStatusLong, "border-bottom: 1px dotted; cursor: help;" },
sendStatusShort);
+ peerRow.addChild("td", "class",
"peer-name").addChild("#",
+ pn.getName());
+ peerRow
+ .addChild("td",
"class", sendStatusClass)
+ .addChild(
+ "span",
+ new
String[] { "title", "style" },
+ new
String[] { sendStatusLong,
+
"border-bottom: 1px dotted; cursor: help;" },
+
sendStatusShort);
}
}
- HTMLNode infoboxContent =
peerTableInfobox.addChild("div", "class", "n2ntm-message-text");
+ HTMLNode infoboxContent =
peerTableInfobox.addChild("div", "class",
+ "n2ntm-message-text");
infoboxContent.addChild("#", message);
HTMLNode list = peerTableInfobox.addChild("ul");
Toadlet.addHomepageLink(list);
- list.addChild("li").addChild("a", new String[] {
"href", "title" }, new String[] { "/friends/", l10n("returnToFriends") },
l10n("friends"));
+ list.addChild("li").addChild("a", new String[] {
"href", "title" },
+ new String[] { "/friends/",
l10n("returnToFriends") },
+ l10n("friends"));
this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
return;
- }
- MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/friends/");
- ctx.sendReplyHeaders(302, "Found", headers, null, 0);
+ }
+ MultiValueTable headers = new MultiValueTable();
+ headers.put("Location", "/friends/");
+ ctx.sendReplyHeaders(302, "Found", headers, null, 0);
}
-
- public static String createN2NTMSendForm(HTMLNode pageNode, HTMLNode
contentNode, ToadletContext ctx, HashMap peers) throws
ToadletContextClosedException, IOException {
- HTMLNode infobox = contentNode.addChild("div", new String[] {
"class", "id" }, new String[] { "infobox", "n2nbox" });
+
+ public static String createN2NTMSendForm(HTMLNode pageNode,
+ HTMLNode contentNode, ToadletContext ctx, HashMap peers)
+ throws ToadletContextClosedException, IOException {
+ HTMLNode infobox = contentNode.addChild("div", new String[] {
"class",
+ "id" }, new String[] { "infobox", "n2nbox" });
infobox.addChild("div", "class", "infobox-header",
l10n("sendMessage"));
- HTMLNode messageTargets = infobox.addChild("div", "class",
"infobox-content");
+ HTMLNode messageTargets = infobox.addChild("div", "class",
+ "infobox-content");
messageTargets.addChild("p", l10n("composingMessageLabel"));
HTMLNode messageTargetList = messageTargets.addChild("ul");
// Iterate peers
- for (Iterator it = peers.values().iterator(); it.hasNext(); ) {
+ for (Iterator it = peers.values().iterator(); it.hasNext();) {
String peer_name = (String) it.next();
messageTargetList.addChild("li", peer_name);
}
- HTMLNode infoboxContent = infobox.addChild("div", "class",
"infobox-content");
- HTMLNode messageForm = ctx.addFormChild(infoboxContent,
"/send_n2ntm/", "sendN2NTMForm");
+ HTMLNode infoboxContent = infobox.addChild("div", "class",
+ "infobox-content");
+ HTMLNode messageForm = ctx.addFormChild(infoboxContent,
"/send_n2ntm/",
+ "sendN2NTMForm");
// Iterate peers
- for (Iterator it = peers.keySet().iterator(); it.hasNext(); ) {
+ for (Iterator it = peers.keySet().iterator(); it.hasNext();) {
String peerNodeHash = (String) it.next();
- messageForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "hidden", "node_"+peerNodeHash, "1" });
+ messageForm.addChild("input", new String[] { "type",
"name",
+ "value" }, new String[] { "hidden",
"node_" + peerNodeHash,
+ "1" });
}
- messageForm.addChild("textarea", new String[] { "id", "name",
"rows", "cols" }, new String[] { "n2ntmtext", "message", "8", "74" });
+ messageForm.addChild("textarea", new String[] { "id", "name",
"rows",
+ "cols" }, new String[] { "n2ntmtext",
"message", "8", "74" });
messageForm.addChild("br");
- messageForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "submit", "send", l10n("sendMessageShort") });
+ messageForm.addChild("input", new String[] { "type", "name",
"value" },
+ new String[] { "submit", "send",
l10n("sendMessageShort") });
return null;
}
}
