Update of /cvsroot/freenet/freenet/src/freenet/fs/dir
In directory sc8-pr-cvs1:/tmp/cvs-serv644/src/freenet/fs/dir
Modified Files:
CircularBuffer.java FSBucketFactory.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: CircularBuffer.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/CircularBuffer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- CircularBuffer.java 30 Oct 2003 02:39:37 -0000 1.20
+++ CircularBuffer.java 31 Oct 2003 18:13:14 -0000 1.21
@@ -2,6 +2,7 @@
import freenet.support.DoublyLinkedList;
import freenet.support.DoublyLinkedListImpl;
+import freenet.support.Logger;
import freenet.support.DoublyLinkedListImpl.Item;
import java.io.*;
import java.util.Enumeration;
@@ -112,7 +113,7 @@
return -1;
int rv = in.read(buf, off, (int) Math.min(len, rlim));
Core.logger.log(this, "VLength "+vlength+" rlim="+rlim+" rlap="+
- rlap+" lap="+lap+" rv="+rv, Core.logger.DEBUG);
+ rlap+" lap="+lap+" rv="+rv, Logger.DEBUG);
if (rv != -1) rlim -= rv;
if(atStart) {
if(rv != -1) atStart = false;
@@ -154,7 +155,7 @@
while (!failed() && ((rlap > lap) || outAtStart)) {
Core.logger.log(this, "Waiting in nextLap: rlap="+rlap+
" lap="+lap+" outAtStart="+outAtStart,
- Core.logger.DEBUG);
+ Logger.DEBUG);
try {
CircularBuffer.this.wait(200); // avoid problems with buggy
JVMs !
}
@@ -256,7 +257,7 @@
// on the previous lap.
while (shouldWait()) {
Core.logger.log(this, "Waiting in nextLap",
- Core.logger.DEBUG);
+ Logger.DEBUG);
try {
CircularBuffer.this.wait(200);
// Avoid problems with buggy JVMs
@@ -281,12 +282,12 @@
if (rlap < lap) {
// we can't go to the next until they enter ours
Core.logger.log(this, "Writer waiting because rlap="+rlap
- +" lap="+lap, Core.logger.DEBUG);
+ +" lap="+lap, Logger.DEBUG);
return true;
}
if(i.in.atStart) {
Core.logger.log(this, "Writer waiting because reader "+
- "atStart", Core.logger.DEBUG);
+ "atStart", Logger.DEBUG);
return true;
// we can't go to the next until they are no longer at position 0
}
@@ -298,7 +299,7 @@
try {
Core.logger.log(this, "closing circularbuffer", new
DirectoryException("debug"),
- Core.logger.DEBUG);
+ Logger.DEBUG);
out.close();
}
finally {
@@ -313,7 +314,7 @@
Core.logger.log(this, "Aborting because only " +
lap + " laps and " + wlim + " left of " +
vlength + " bytes were written.",
- Core.logger.MINOR);
+ Logger.MINOR);
// MINOR because it can happen due to eg connections
// being closed prematurely
CircularBuffer.this.notifyAll();
Index: FSBucketFactory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/FSBucketFactory.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -w -r1.1.1.1 -r1.2
--- FSBucketFactory.java 13 Jan 2002 05:24:34 -0000 1.1.1.1
+++ FSBucketFactory.java 31 Oct 2003 18:13:14 -0000 1.2
@@ -2,6 +2,8 @@
import freenet.support.Bucket;
import freenet.support.BucketFactory;
+import freenet.support.Logger;
+
import java.io.*;
@@ -18,7 +20,7 @@
Buffer buf = dir.forceStore(size, FileNumber.NIL);
freenet.Core.logger.log(this,
"making bucket: "+buf,
- freenet.Core.logger.DEBUG);
+ Logger.DEBUG);
return new FSBucket(buf);
}
@@ -55,7 +57,7 @@
if (!released) { // check again, now that we are synced
freenet.Core.logger.log(FSBucketFactory.this,
"freeing bucket: "+buffer,
- freenet.Core.logger.DEBUG);
+ Logger.DEBUG);
released = true;
buffer.release();
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
