Update of /cvsroot/freenet/freenet/src/freenet/client
In directory sc8-pr-cvs1:/tmp/cvs-serv644/src/freenet/client
Modified Files:
SplitFileInsertManager.java AutoBackoffNodeRequester.java
Log Message:
Fix all Core.logger.{DEBUG,etc} uses to be Logger.{DEBUG,etc}. Kills tons of eclipse
warnings, total down to 872 now (started a little under 2300).
Index: SplitFileInsertManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/SplitFileInsertManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- SplitFileInsertManager.java 30 Oct 2003 01:34:03 -0000 1.9
+++ SplitFileInsertManager.java 31 Oct 2003 18:13:14 -0000 1.10
@@ -21,6 +21,7 @@
import freenet.message.client.FEC.SegmentHeader;
import freenet.support.Bucket;
import freenet.support.BucketTools;
+import freenet.support.Logger;
import freenet.support.NullBucket;
/**
@@ -74,7 +75,7 @@
System.err.println("WARNING: Crappy client code is throwing from an event
handler!");
e.printStackTrace();
System.err.println("------------------------------------------------------------");
- Core.logger.log(this, "WARNING: Crappy client code is throwing from an
event handler!", e, Core.logger.ERROR);
+ Core.logger.log(this, "WARNING: Crappy client code is throwing from an
event handler!", e, Logger.ERROR);
}
}
@@ -98,7 +99,7 @@
// Handle key collisions correctly.
void rawEvent(ClientEvent ce) {
Core.logger.log(this, "Got event "+ce,
- Core.logger.DEBUG);
+ Logger.DEBUG);
if (ce.getCode() == CollisionEvent.code) {
CollisionEvent coe = (CollisionEvent)ce;
ClientKey ckey = coe.getKey();
Index: AutoBackoffNodeRequester.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/AutoBackoffNodeRequester.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- AutoBackoffNodeRequester.java 18 Sep 2003 17:48:05 -0000 1.14
+++ AutoBackoffNodeRequester.java 31 Oct 2003 18:13:14 -0000 1.15
@@ -51,7 +51,7 @@
this.inserting = inserting;
logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
Core.logger.log(this, "Starting internal request: "+uri,
- Core.logger.MINOR);
+ Logger.MINOR);
}
protected boolean doRedirect() {
@@ -98,7 +98,7 @@
try {
if(logDEBUG)
Core.logger.log(this, "Running checkpoint for internal request: "+
- getCheckpointName(), Core.logger.DEBUG);
+ getCheckpointName(), Logger.DEBUG);
if (internalRun()) {
synchronized(runSync) {
running = false;
@@ -191,17 +191,17 @@
getCheckpointName(), Logger.DEBUG);
if (rnf != null) {
Core.logger.log(this, "RouteNotFound " + getCheckpointName(),
- Core.logger.NORMAL);
+ Logger.NORMAL);
} else if (dnf != null) {
Core.logger.log(this, "DataNotFound " + getCheckpointName(),
- Core.logger.MINOR);
+ Logger.MINOR);
} else if (inserting && (coll != null)) {
Core.logger.log(this, "Collision " + getCheckpointName(),
- Core.logger.NORMAL);
+ Logger.NORMAL);
return failedCollision(coll);
} else if (noreply != null) {
Core.logger.log(this, "Reply timeout " + getCheckpointName(),
- Core.logger.MINOR);
+ Logger.MINOR);
return false; // retry
} else if(notValid) {
Core.logger.log(this, "Invalid data " + getCheckpointName(),
@@ -210,7 +210,7 @@
} else {
Core.logger.log(this, "Unexpected Failure " +
getCheckpointName()+": "+r.getError(),
- r.getThrowable(), Core.logger.ERROR);
+ r.getThrowable(), Logger.ERROR);
// Can probably retry
}
synchronized(runSync) {
@@ -251,11 +251,11 @@
getCheckpointName(), Logger.MINOR);
} else if (ce instanceof DocumentNotValidEvent) {
Core.logger.log(this, "DocumentNotValid for "+this,
- Core.logger.MINOR);
+ Logger.MINOR);
notValid = true;
} else if (ce instanceof RestartedEvent) {
Core.logger.log(this, "Restarted "+getCheckpointName(),
- Core.logger.MINOR);
+ Logger.MINOR);
} else if (ce instanceof NoReplyEvent) {
noreply = (NoReplyEvent)ce;
} else if (ce instanceof StateReachedEvent) {
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
