Author: nextgens
Date: 2006-07-06 16:08:28 +0000 (Thu, 06 Jul 2006)
New Revision: 9477
Modified:
trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
trunk/freenet/src/freenet/pluginmanager/FredPluginIPDetector.java
trunk/freenet/src/freenet/pluginmanager/FredPluginThreadless.java
trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java
Log:
fix some eclipse warnings and hopefully resolve #500 (now we can send N2NM to
incompatible peers)
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2006-07-06
13:27:06 UTC (rev 9476)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2006-07-06
16:08:28 UTC (rev 9477)
@@ -56,6 +56,7 @@
}
if(peernode_name == null) {
buf.append("PeerNode.hashCode
'"+input_hashcode_string+"' not found.<br /><br />\n");
+ buf.append("<a href=\"/\" title=\"Back to Node
Homepage\">Homepage</a>\n");
buf.append("<a href=\"/darknet/\">Back to Darknet
page</a>\n");
ctx.getPageMaker().makeTail(buf);
this.writeReply(ctx, 200, "text/html", "OK",
buf.toString());
@@ -134,6 +135,7 @@
buf.append("PeerNode.hashCode
'"+input_hashcode_string+"' not found.<br /><br />\n");
buf.append("</div>");
buf.append("</div>");
+ buf.append("<a href=\"/\" title=\"Node
Homepage\">Back to Homepage</a>\n");
buf.append("<a href=\"/darknet/\">Back to Darknet
page</a>\n");
ctx.getPageMaker().makeTail(buf);
this.writeReply(ctx, 200, "text/html", "OK",
buf.toString());
@@ -162,7 +164,7 @@
buf.append("PeerNode.hashCode
'"+request.getParam("hashcode")+"' not found.<br /><br />\n");
buf.append("</div>");
buf.append("</div>");
- } else if(!pn.isConnected()) {
+ } else if(!pn.isConnected() &&
!pn.isVerifiedIncompatibleNewerVersion() &&
!pn.isVerifiedIncompatibleOlderVersion()) {
ctx.getPageMaker().makeHead(buf, "Node To
Node Text Message Failed");
buf.append("<div class=\"infobox
infobox-error\">");
@@ -210,6 +212,7 @@
buf.append("Got NotConnectedException sending message
to Peer '"+HTMLEncoder.encode(pn.getName())+"'. Can't send N2NTM.<br /><br
/>\n");
Logger.error(this, "Caught NotConnectedException
while trying to send n2ntm: "+e);
}
+ buf.append("<a href=\"/\" title=\"Node Homepage\">Back to
Homepage</a>\n");
buf.append("<a href=\"/darknet/\">Back to Darknet
page</a>\n");
ctx.getPageMaker().makeTail(buf);
this.writeReply(ctx, 200, "text/html", "OK", buf.toString());
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2006-07-06 13:27:06 UTC (rev 9476)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2006-07-06 16:08:28 UTC (rev 9477)
@@ -36,7 +36,6 @@
}
public String getTitle() {
- long now = System.currentTimeMillis();
if(peers == 0)
return "No peers found";
if(conns == 0)
Modified: trunk/freenet/src/freenet/pluginmanager/FredPluginIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/FredPluginIPDetector.java
2006-07-06 13:27:06 UTC (rev 9476)
+++ trunk/freenet/src/freenet/pluginmanager/FredPluginIPDetector.java
2006-07-06 16:08:28 UTC (rev 9477)
@@ -1,7 +1,5 @@
package freenet.pluginmanager;
-import java.net.InetAddress;
-
public interface FredPluginIPDetector {
public DetectedIP[] getAddress();
Modified: trunk/freenet/src/freenet/pluginmanager/FredPluginThreadless.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/FredPluginThreadless.java
2006-07-06 13:27:06 UTC (rev 9476)
+++ trunk/freenet/src/freenet/pluginmanager/FredPluginThreadless.java
2006-07-06 16:08:28 UTC (rev 9477)
@@ -1,7 +1,5 @@
package freenet.pluginmanager;
-import freenet.clients.http.HTTPRequest;
-
public interface FredPluginThreadless {
}
Modified: trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java
2006-07-06 13:27:06 UTC (rev 9476)
+++ trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java
2006-07-06 16:08:28 UTC (rev 9477)
@@ -16,6 +16,7 @@
this.node = node;
this.hlsc =
node.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS);
this.toadletList = new HashMap();
+ this.pm = pm;
}
//public HighLevelSimpleClient getHLSimpleClient() throws
PluginSecurityException {
