Author: j16sdiz
Date: 2009-04-23 08:54:45 +0000 (Thu, 23 Apr 2009)
New Revision: 27238
Modified:
trunk/freenet/src/freenet/node/DarknetPeerNode.java
Log:
Factor out common HTML code
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2009-04-23 08:54:23 UTC
(rev 27237)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2009-04-23 08:54:45 UTC
(rev 27238)
@@ -943,26 +943,8 @@
new String[] {
filename, getName() }));
// Descriptive table
+ describeFile(div);
- HTMLNode table = div.addChild("table",
"border", "0");
- HTMLNode row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("fileLabel"));
- row.addChild("td").addChild("#",
filename);
- row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("sizeLabel"));
- row.addChild("td").addChild("#",
SizeUtil.formatSize(size));
- row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("mimeLabel"));
- row.addChild("td").addChild("#",
mimeType);
- row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("senderLabel"));
- row.addChild("td").addChild("#",
getName());
- row = table.addChild("tr");
- if(comment != null && comment.length()
> 0) {
-
row.addChild("td").addChild("#", l10n("commentLabel"));
- addComment(row.addChild("td"));
- }
-
return div;
}
@@ -1056,26 +1038,8 @@
new String[] {
filename, getName() }));
// Descriptive table
+ describeFile(div);
- HTMLNode table = div.addChild("table",
"border", "0");
- HTMLNode row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("fileLabel"));
- row.addChild("td").addChild("#",
filename);
- row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("sizeLabel"));
- row.addChild("td").addChild("#",
SizeUtil.formatSize(size));
- row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("mimeLabel"));
- row.addChild("td").addChild("#",
mimeType);
- row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("senderLabel"));
- row.addChild("td").addChild("#",
getName());
- row = table.addChild("tr");
- if(comment != null && comment.length()
> 0) {
-
row.addChild("td").addChild("#", l10n("commentLabel"));
- addComment(row.addChild("td"));
- }
-
return div;
}
@@ -1152,7 +1116,6 @@
node.clientCore.alerts.register(alert);
}
-
/** Ask the user whether (s)he wants to download a file from a
direct peer */
public UserAlert askUserUserAlert() {
return new AbstractUserAlert() {
@@ -1167,26 +1130,8 @@
div.addChild("p",
l10n("offeredFileHeader", "name", getName()));
// Descriptive table
+ describeFile(div);
- HTMLNode table = div.addChild("table",
"border", "0");
- HTMLNode row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("fileLabel"));
- row.addChild("td").addChild("#",
filename);
- row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("sizeLabel"));
- row.addChild("td").addChild("#",
SizeUtil.formatSize(size));
- row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("mimeLabel"));
- row.addChild("td").addChild("#",
mimeType);
- row = table.addChild("tr");
- row.addChild("td").addChild("#",
l10n("senderLabel"));
- row.addChild("td").addChild("#",
getName());
- row = table.addChild("tr");
- if(comment != null && comment.length()
> 0) {
-
row.addChild("td").addChild("#", l10n("commentLabel"));
- addComment(row.addChild("td"));
- }
-
// Accept/reject form
// Hopefully we will have a container
when this function is called!
@@ -1294,6 +1239,28 @@
private String l10n(String key, String[] pattern, String[]
value) {
return L10n.getString("FileOffer."+key, pattern, value);
}
+
+
+ private void describeFile(HTMLNode div) {
+ HTMLNode table = div.addChild("table", "border", "0");
+ HTMLNode row = table.addChild("tr");
+ row.addChild("td").addChild("#", l10n("fileLabel"));
+ row.addChild("td").addChild("#", filename);
+ row = table.addChild("tr");
+ row.addChild("td").addChild("#", l10n("sizeLabel"));
+ row.addChild("td").addChild("#",
SizeUtil.formatSize(size));
+ row = table.addChild("tr");
+ row.addChild("td").addChild("#", l10n("mimeLabel"));
+ row.addChild("td").addChild("#", mimeType);
+ row = table.addChild("tr");
+ row.addChild("td").addChild("#", l10n("senderLabel"));
+ row.addChild("td").addChild("#", getName());
+ row = table.addChild("tr");
+ if(comment != null && comment.length() > 0) {
+ row.addChild("td").addChild("#",
l10n("commentLabel"));
+ addComment(row.addChild("td"));
+ }
+ }
}
public int sendTextMessage(String message) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
