Author: toad
Date: 2009-01-13 18:11:56 +0000 (Tue, 13 Jan 2009)
New Revision: 25048
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
trunk/freenet/src/freenet/node/Announcer.java
trunk/freenet/src/freenet/node/DarknetPeerNode.java
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeIPDetector.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/SecurityLevels.java
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
trunk/freenet/src/freenet/node/useralerts/AbstractUserAlert.java
trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
trunk/freenet/src/freenet/node/useralerts/ClockProblemDetectedUserAlert.java
trunk/freenet/src/freenet/node/useralerts/ExtOldAgeUserAlert.java
trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
trunk/freenet/src/freenet/node/useralerts/InvalidAddressOverrideUserAlert.java
trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
trunk/freenet/src/freenet/node/useralerts/NotEnoughNiceLevelsUserAlert.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
trunk/freenet/src/freenet/node/useralerts/ProxyUserAlert.java
trunk/freenet/src/freenet/node/useralerts/TimeSkewDetectedUserAlert.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
trunk/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
Log:
Pass in the ToadletContainer to useralerts, not the LinkFixer.
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2009-01-13
03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2009-01-13
18:11:56 UTC (rev 25048)
@@ -56,7 +56,7 @@
@Override
public String getText() {
- return getHTMLText(NullLinkFixer.instance).toString();
+ return getHTMLText(container).toString();
}
@Override
@@ -65,15 +65,13 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
HTMLNode alertNode = new HTMLNode("div");
alertNode.addChild("#", l10n("needRestart"));
if (node.isUsingWrapper()) {
alertNode.addChild("br");
- HTMLNode restartForm =
alertNode.addChild("form", //
- new String[] { "action",
"method", "enctype" },//
- new String[] { "/", "post",
"multipart/form-data" });
+ HTMLNode restartForm =
fixer.addFormChild(alertNode, "/", "restartForm");
restartForm.addChild("div");
restartForm.addChild("input",//
new String[] { "type", "name"
},//
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -4,6 +4,7 @@
package freenet.clients.http.bookmark;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.keys.FreenetURI;
import freenet.keys.USK;
import freenet.l10n.L10n;
@@ -82,7 +83,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
HTMLNode n = new HTMLNode("div");
L10n.addL10nSubstitution(n,
"BookmarkItem.bookmarkUpdatedWithLink", new String[]{"link", "/link", "name",
"edition"},
new String[]{"<a href=\"" +
fixer.fixLink("/"+key.toString()) + "\">", "</a>", HTMLEncoder.encode(name),
Long.toString(key.getSuggestedEdition())});
Modified: trunk/freenet/src/freenet/node/Announcer.java
===================================================================
--- trunk/freenet/src/freenet/node/Announcer.java 2009-01-13 03:30:03 UTC
(rev 25047)
+++ trunk/freenet/src/freenet/node/Announcer.java 2009-01-13 18:11:56 UTC
(rev 25048)
@@ -17,6 +17,7 @@
import java.util.Vector;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.io.comm.PeerParseException;
import freenet.io.comm.ReferenceSignatureVerificationException;
import freenet.l10n.L10n;
@@ -543,7 +544,7 @@
return L10n.getString("UserAlert.hide");
}
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
return new HTMLNode("#", getText());
}
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2009-01-13 03:30:03 UTC
(rev 25047)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2009-01-13 18:11:56 UTC
(rev 25048)
@@ -17,6 +17,7 @@
import freenet.client.DefaultMIMETypes;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.crypt.BlockCipher;
import freenet.io.comm.DMT;
import freenet.io.comm.DisconnectedException;
@@ -938,7 +939,7 @@
return L10n.getString("UserAlert.hide");
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer
fixer) {
HTMLNode div = new HTMLNode("div");
div.addChild("p",
l10n("failedReceiveHeader", new String[] { "filename", "node" },
@@ -1049,7 +1050,7 @@
return L10n.getString("UserAlert.hide");
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer
fixer) {
HTMLNode div = new HTMLNode("div");
// FIXME localise!!!
@@ -1163,7 +1164,7 @@
return null; // Cannot hide, but can
reject
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer
fixer) {
HTMLNode div = new HTMLNode("div");
div.addChild("p",
l10n("offeredFileHeader", "name", getName()));
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2009-01-13
03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2009-01-13
18:11:56 UTC (rev 25048)
@@ -13,6 +13,7 @@
import net.i2p.util.NativeBigInteger;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.crypt.BlockCipher;
import freenet.crypt.DSA;
import freenet.crypt.DSAGroup;
@@ -2693,7 +2694,7 @@
return l10n("somePeersDisconnectedStillNotAcked",
"count", Integer.toString(sz));
}
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
HTMLNode div = new HTMLNode("div");
Peer[] peers;
synchronized(peersWithProblems) {
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2009-01-13
03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2009-01-13
18:11:56 UTC (rev 25048)
@@ -8,6 +8,7 @@
import java.util.Vector;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.clients.http.filter.GenericReadFilterCallback;
import freenet.io.AddressTracker;
import freenet.io.comm.FreenetInetAddress;
@@ -53,7 +54,7 @@
return L10n.getString("UserAlert.hide");
}
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
HTMLNode div = new HTMLNode("div");
String url =
GenericReadFilterCallback.escapeURL(HTMLEncoder.encode(l10n("portForwardHelpURL")));
boolean maybeForwarded = true;
@@ -189,7 +190,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
HTMLNode div = new HTMLNode("div");
div.addChild("#", super.getText());
if(suggestPortForward) {
@@ -934,7 +935,7 @@
return plugins.length > 0;
}
- public void addConnectionTypeBox(HTMLNode contentNode, LinkFixer ctx) {
+ public void addConnectionTypeBox(HTMLNode contentNode, ToadletContainer
ctx) {
if(node.clientCore == null) return;
if(node.clientCore.alerts == null) return;
if(proxyAlert.isValid())
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2009-01-13 03:30:03 UTC (rev
25047)
+++ trunk/freenet/src/freenet/node/Node.java 2009-01-13 18:11:56 UTC (rev
25048)
@@ -1848,7 +1848,7 @@
.getString("Node.storeSaltHashMigratedShort"), UserAlert.MINOR) {
@Override
- public HTMLNode getHTMLText(LinkFixer
fixer) {
+ public HTMLNode
getHTMLText(ToadletContainer fixer) {
HTMLNode div = new
HTMLNode("div");
div.addChild("#",
L10n.getString("Node.storeSaltHashMigrated"));
HTMLNode ul =
div.addChild("ul");
@@ -2349,7 +2349,7 @@
clientCore.alerts.register(new
AbstractUserAlert(false, null, null, null, null, UserAlert.ERROR, true, null,
false, null) {
@Override
- public HTMLNode getHTMLText(LinkFixer
fixer) {
+ public HTMLNode
getHTMLText(ToadletContainer fixer) {
HTMLNode n = new
HTMLNode("div");
L10n.addL10nSubstitution(n,
"Node.buggyJVMWithLink",
new String[] {
"link", "/link", "version" },
Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java 2009-01-13 03:30:03 UTC
(rev 25047)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java 2009-01-13 18:11:56 UTC
(rev 25048)
@@ -10,6 +10,7 @@
import java.util.Map;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.config.InvalidConfigValueException;
import freenet.config.SubConfig;
import freenet.io.comm.FreenetInetAddress;
@@ -574,7 +575,7 @@
node.clientCore.alerts.register(invalidAddressOverrideAlert);
}
- public void addConnectionTypeBox(HTMLNode contentNode, LinkFixer ctx) {
+ public void addConnectionTypeBox(HTMLNode contentNode, ToadletContainer
ctx) {
ipDetectorManager.addConnectionTypeBox(contentNode, ctx);
}
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2009-01-13 03:30:03 UTC
(rev 25047)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2009-01-13 18:11:56 UTC
(rev 25048)
@@ -14,6 +14,7 @@
import org.tanukisoftware.wrapper.WrapperManager;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.io.comm.Peer;
import freenet.l10n.L10n;
import freenet.node.useralerts.UserAlert;
@@ -475,7 +476,7 @@
return l10n("somePeersDisconnectedBlockedTooLong",
"count", Integer.toString(sz));
}
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
HTMLNode div = new HTMLNode("div");
Peer[] peers;
synchronized(peersDumpedBlockedTooLong) {
Modified: trunk/freenet/src/freenet/node/SecurityLevels.java
===================================================================
--- trunk/freenet/src/freenet/node/SecurityLevels.java 2009-01-13 03:30:03 UTC
(rev 25047)
+++ trunk/freenet/src/freenet/node/SecurityLevels.java 2009-01-13 18:11:56 UTC
(rev 25048)
@@ -8,6 +8,8 @@
import freenet.clients.http.ConfigToadlet;
import freenet.clients.http.LinkFixer;
import freenet.clients.http.NullLinkFixer;
+import freenet.clients.http.NullToadletContainer;
+import freenet.clients.http.ToadletContainer;
import freenet.config.EnumerableOptionCallback;
import freenet.config.InvalidConfigValueException;
import freenet.config.NodeNeedRestartException;
@@ -406,7 +408,7 @@
return L10n.getString("UserAlert.hide");
}
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
HTMLNode div = new HTMLNode("div");
HTMLNode ul = div.addChild("ul");
ul.addChild("li",
l10n("userAlertNetworkThreatLevel", "level",
localisedName(networkThreatLevel)));
@@ -432,7 +434,7 @@
}
public String getText() {
- return
getHTMLText(NullLinkFixer.instance).getContent();
+ return
getHTMLText(NullToadletContainer.instance).getContent();
}
public String getTitle() {
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -28,6 +28,7 @@
import freenet.client.async.ClientPutter;
import freenet.client.async.SimpleBlockSet;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.io.comm.AsyncMessageCallback;
import freenet.io.comm.DMT;
import freenet.io.comm.DisconnectedException;
@@ -540,7 +541,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
HTMLNode div = new HTMLNode("div");
div.addChild("p").addChild("#", l10n("intro"));
Modified: trunk/freenet/src/freenet/node/useralerts/AbstractUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/AbstractUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/AbstractUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -18,7 +18,7 @@
package freenet.node.useralerts;
-import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.support.HTMLNode;
/**
@@ -94,7 +94,7 @@
/**
* {...@inheritdoc}
*/
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
return htmlText;
}
Modified: trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -4,6 +4,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.l10n.L10n;
import freenet.support.HTMLNode;
@@ -36,7 +37,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
return new HTMLNode("div", getText());
}
Modified:
trunk/freenet/src/freenet/node/useralerts/ClockProblemDetectedUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/ClockProblemDetectedUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++
trunk/freenet/src/freenet/node/useralerts/ClockProblemDetectedUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -4,6 +4,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.l10n.L10n;
import freenet.support.HTMLNode;
@@ -43,7 +44,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
return new HTMLNode("div", getText());
}
Modified: trunk/freenet/src/freenet/node/useralerts/ExtOldAgeUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/ExtOldAgeUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/ExtOldAgeUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -1,6 +1,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.l10n.L10n;
import freenet.support.HTMLNode;
@@ -28,7 +29,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
return new HTMLNode("div", getText());
}
Modified: trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -4,6 +4,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.config.Option;
import freenet.config.SubConfig;
import freenet.l10n.L10n;
@@ -47,7 +48,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
if(node.ipDetector.noDetectPlugins()) {
HTMLNode p = new HTMLNode("p");
L10n.addL10nSubstitution(p,
"IPUndetectedUserAlert.loadDetectPlugins", new String[] { "plugins",
"/plugins", "config", "/config" }, new String[] { "<a
href=\""+fixer.fixLink("/plugins/")+"\">", "</a>", "<a
href=\""+fixer.fixLink("/config/")+"\">", "</a>" });
Modified:
trunk/freenet/src/freenet/node/useralerts/InvalidAddressOverrideUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/InvalidAddressOverrideUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++
trunk/freenet/src/freenet/node/useralerts/InvalidAddressOverrideUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -4,6 +4,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.config.Option;
import freenet.config.SubConfig;
import freenet.l10n.L10n;
@@ -34,7 +35,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
SubConfig sc = node.config.get("node");
Option<?> o = sc.getOption("ipAddressOverride");
Modified:
trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -4,6 +4,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.config.Option;
import freenet.config.SubConfig;
import freenet.l10n.L10n;
@@ -38,7 +39,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
SubConfig sc = node.config.get("node");
Option<?> o = sc.getOption("name");
Modified: trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -7,6 +7,7 @@
import java.util.Date;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.l10n.L10n;
import freenet.node.DarknetPeerNode;
import freenet.support.HTMLNode;
@@ -53,7 +54,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
HTMLNode alertNode = new HTMLNode("div");
alertNode.addChild("p",
l10n("header", new String[] { "from",
"composed", "sent", "received" },
Modified:
trunk/freenet/src/freenet/node/useralerts/NotEnoughNiceLevelsUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/NotEnoughNiceLevelsUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/NotEnoughNiceLevelsUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -5,6 +5,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.l10n.L10n;
import freenet.support.HTMLNode;
import freenet.support.io.NativeThread;
@@ -41,7 +42,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
return new HTMLNode("div", getText());
}
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -4,6 +4,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.l10n.L10n;
import freenet.node.NodeStats;
import freenet.support.HTMLNode;
@@ -175,7 +176,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
HTMLNode alertNode = new HTMLNode("div");
if (peers == 0 && !isOpennetEnabled) {
Modified: trunk/freenet/src/freenet/node/useralerts/ProxyUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/ProxyUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/ProxyUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -1,6 +1,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.support.HTMLNode;
/**
@@ -45,7 +46,7 @@
return alert.getText();
}
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
return alert.getHTMLText(fixer);
}
Modified:
trunk/freenet/src/freenet/node/useralerts/TimeSkewDetectedUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/TimeSkewDetectedUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/TimeSkewDetectedUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -4,6 +4,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.l10n.L10n;
import freenet.support.HTMLNode;
@@ -44,7 +45,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
return new HTMLNode("div", getText());
}
Modified:
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2009-01-13 03:30:03 UTC (rev 25047)
+++
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -4,6 +4,7 @@
package freenet.node.useralerts;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.l10n.L10n;
import freenet.node.updater.NodeUpdateManager;
import freenet.node.updater.RevocationChecker;
@@ -76,7 +77,7 @@
}
@Override
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
UpdateThingy ut = createUpdateThingy();
Modified: trunk/freenet/src/freenet/node/useralerts/UserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlert.java 2009-01-13
03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlert.java 2009-01-13
18:11:56 UTC (rev 25048)
@@ -3,7 +3,7 @@
* http://www.gnu.org/ for further details of the GPL. */
package freenet.node.useralerts;
-import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.support.HTMLNode;
public interface UserAlert {
@@ -27,7 +27,7 @@
/**
* Content of alert (HTML).
*/
- public HTMLNode getHTMLText(LinkFixer fixer);
+ public HTMLNode getHTMLText(ToadletContainer ctx);
/**
* *Really* concise text of alert. Should be comfortably under a line
even when translated
Modified: trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -9,6 +9,7 @@
import java.util.LinkedHashSet;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.clients.http.ToadletContext;
import freenet.l10n.L10n;
import freenet.node.NodeClientCore;
@@ -103,7 +104,7 @@
/**
* Write the alerts as HTML.
*/
- public HTMLNode createAlerts(LinkFixer fixer) {
+ public HTMLNode createAlerts(ToadletContainer fixer) {
HTMLNode alertsNode = new HTMLNode("div");
UserAlert[] alerts = getAlerts();
int totalNumber = 0;
@@ -177,7 +178,7 @@
* The user alert to render
* @return The rendered HTML node
*/
- public HTMLNode renderAlert(UserAlert userAlert, LinkFixer fixer) {
+ public HTMLNode renderAlert(UserAlert userAlert, ToadletContainer
fixer) {
HTMLNode userAlertNode = null;
short level = userAlert.getPriorityClass();
userAlertNode = new HTMLNode("div", "class", "infobox
infobox-"+getAlertLevelName(level));
Modified: trunk/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
2009-01-13 03:30:03 UTC (rev 25047)
+++ trunk/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
2009-01-13 18:11:56 UTC (rev 25048)
@@ -30,6 +30,7 @@
import org.tanukisoftware.wrapper.WrapperManager;
import freenet.clients.http.LinkFixer;
+import freenet.clients.http.ToadletContainer;
import freenet.keys.KeyVerifyException;
import freenet.l10n.L10n;
import freenet.node.SemiOrderedShutdownHook;
@@ -1418,7 +1419,7 @@
return L10n.getString("UserAlert.hide");
}
- public HTMLNode getHTMLText(LinkFixer fixer) {
+ public HTMLNode getHTMLText(ToadletContainer fixer) {
return new HTMLNode("#", getText());
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
