Author: toad
Date: 2006-03-18 20:09:48 +0000 (Sat, 18 Mar 2006)
New Revision: 8277
Modified:
trunk/freenet/src/freenet/client/events/EventDumper.java
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
trunk/freenet/src/freenet/node/Version.java
Log:
546:
Minor fixes.
Show events on the individual TMCI connection, not on stderr.
Modified: trunk/freenet/src/freenet/client/events/EventDumper.java
===================================================================
--- trunk/freenet/src/freenet/client/events/EventDumper.java 2006-03-18
17:27:07 UTC (rev 8276)
+++ trunk/freenet/src/freenet/client/events/EventDumper.java 2006-03-18
20:09:48 UTC (rev 8277)
@@ -1,9 +1,17 @@
package freenet.client.events;
+import java.io.PrintWriter;
+
public class EventDumper implements ClientEventListener {
+ final PrintWriter pw;
+
+ public EventDumper(PrintWriter writer) {
+ this.pw = writer;
+ }
+
public void receive(ClientEvent ce) {
- System.err.println(ce.getDescription());
+ pw.println(ce.getDescription());
}
}
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-03-18 17:27:07 UTC (rev 8276)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-03-18 20:09:48 UTC (rev 8277)
@@ -128,7 +128,7 @@
Integer x = (Integer) row[0];
if(x == CONNECTED) row[0] = "<span
class=\"peer_connected\">CONNECTED</span>";
else if(x == BACKED_OFF) row[0] = "<span
class=\"peer_backedoff\">BACKED OFF</span>";
- else if(x == INCOMPATIBLE) row[0] = "<span
span=\"peer_incompatable\">INCOMPATIBLE</span>";
+ else if(x == INCOMPATIBLE) row[0] = "<span
class=\"peer_incompatable\">INCOMPATIBLE</span>";
else if(x == DISCONNECTED) row[0] = "<span
class=\"peer_disconnected\">DISCONNECTED</span>";
}
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-03-18
17:27:07 UTC (rev 8276)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-03-18
20:09:48 UTC (rev 8277)
@@ -25,6 +25,7 @@
import freenet.client.HighLevelSimpleClient;
import freenet.client.InsertBlock;
import freenet.client.InserterException;
+import freenet.client.events.EventDumper;
import freenet.crypt.RandomSource;
import freenet.io.comm.Peer;
import freenet.io.comm.PeerParseException;
@@ -58,11 +59,12 @@
public TextModeClientInterface(TextModeClientInterfaceServer server,
InputStream in, OutputStream out) {
this.n = server.n;
this.r = server.r;
- this.client = server.client;
+ client =
server.n.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS);
this.streams = new Hashtable();
this.downloadsDir = server.downloadsDir;
this.in = in;
this.out = out;
+ client.addGlobalHook(new EventDumper(new PrintWriter(out)));
}
public TextModeClientInterface(Node n, HighLevelSimpleClient c, File
downloadDir, InputStream in, OutputStream out) {
@@ -73,6 +75,7 @@
this.downloadsDir = downloadDir;
this.in = in;
this.out = out;
+ client.addGlobalHook(new EventDumper(new PrintWriter(out)));
}
public void run() {
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2006-03-18 17:27:07 UTC (rev 8276)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2006-03-18 20:09:48 UTC (rev 8277)
@@ -26,17 +26,15 @@
final RandomSource r;
final Node n;
- final HighLevelSimpleClient client;
+// final HighLevelSimpleClient client;
final Hashtable streams;
final File downloadsDir;
int port;
final String bindTo;
boolean isEnabled;
- TextModeClientInterfaceServer(Node n, HighLevelSimpleClient client, int
port, String bindTo) {
+ TextModeClientInterfaceServer(Node n, int port, String bindTo) {
this.n = n;
- this.client = client;
- client.addGlobalHook(new EventDumper());
this.r = n.random;
streams = new Hashtable();
this.downloadsDir = n.downloadDir;
@@ -63,10 +61,9 @@
int port = TMCIConfig.getInt("port");
String bind_ip = TMCIConfig.getString("bindTo");
boolean direct = TMCIConfig.getBoolean("directEnabled");
- HighLevelSimpleClient client =
node.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS);
if(TMCIEnabled){
- new TextModeClientInterfaceServer(node, client, port,
bind_ip);
+ new TextModeClientInterfaceServer(node, port, bind_ip);
Logger.normal(node, "TMCI started on
"+bind_ip+":"+port);
System.out.println("TMCI started on "+bind_ip+":"+port);
}
@@ -75,6 +72,7 @@
}
if(direct) {
+ HighLevelSimpleClient client =
node.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS);
TextModeClientInterface directTMCI =
new TextModeClientInterface(node, client,
node.downloadDir, System.in, System.out);
Thread t = new Thread(directTMCI, "Direct text mode
interface");
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-18 17:27:07 UTC (rev
8276)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-18 20:09:48 UTC (rev
8277)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 545;
+ private static final int buildNumber = 546;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 507;
