Update of /cvsroot/freenet/freenet/src/freenet/message
In directory sc8-pr-cvs1:/tmp/cvs-serv644/src/freenet/message
Modified Files:
QueryRejected.java NodeMessage.java DataReply.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: QueryRejected.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryRejected.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- QueryRejected.java 30 Oct 2003 15:27:38 -0000 1.12
+++ QueryRejected.java 31 Oct 2003 18:13:15 -0000 1.13
@@ -7,6 +7,7 @@
import freenet.Presentation;
import freenet.RawMessage;
import freenet.support.Fields;
+import freenet.support.Logger;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
It is distributed under the GNU General Public Licence (GPL)
@@ -72,7 +73,7 @@
otherFields.remove("HopsToLive");
otherFields.remove("Reason");
otherFields.remove("Attenuation");
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("debug:QR:a");
else initException = null;
}
@@ -81,7 +82,7 @@
super(idnum ,otherfields);
hopsToLive = htl;
this.attenuation = 0;
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("debug:QR:b");
else initException = null;
}
@@ -92,7 +93,7 @@
hopsToLive = htl;
this.attenuation = 0;
this.reason = reason;
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("debug:QR:c");
else initException = null;
}
@@ -103,7 +104,7 @@
hopsToLive = htl;
this.attenuation = attenuation;
this.reason = reason;
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("debug:QR:d");
else initException = null;
}
Index: NodeMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/NodeMessage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- NodeMessage.java 30 Oct 2003 15:27:38 -0000 1.11
+++ NodeMessage.java 31 Oct 2003 18:13:16 -0000 1.12
@@ -10,6 +10,7 @@
import freenet.Version;
import freenet.crypt.EntropySource;
import freenet.support.Fields;
+import freenet.support.Logger;
/**
* Superclass for messages that are sent between nodes (basically those
@@ -36,7 +37,7 @@
" LIST! (TYPE "+s+": "+Fields.longToHex(id)+
details+")";
Exception e = new Exception("heisenbug debug");
- Core.logger.log(this, o, e, Core.logger.ERROR);
+ Core.logger.log(this, o, e, Logger.ERROR);
System.err.println(o);
e.printStackTrace(System.err);
}
@@ -48,10 +49,10 @@
super(id);
if(id == 0) {
Core.logger.log(this, "Creating NodeMessage with 0 ID",
- new Exception("debug"), Core.logger.DEBUG);
+ new Exception("debug"), Logger.DEBUG);
} else if (id == -1) {
Core.logger.log(this, "Creating NodeMessage with -1 ID",
- new Exception("debug"), Core.logger.DEBUG);
+ new Exception("debug"), Logger.DEBUG);
} else if (((id>>>32) & 0xffffffffL) == (id & 0xffffffffL)) {
logHeisenbug("A", id);
}
@@ -67,10 +68,10 @@
super(id, otherFields);
if(id == 0) {
Core.logger.log(this, "Creating NodeMessage with 0 ID",
- Core.logger.DEBUG);
+ Logger.DEBUG);
} else if (id == -1) {
Core.logger.log(this, "Creating NodeMessage with -1 ID",
- Core.logger.DEBUG);
+ Logger.DEBUG);
} else if (((id>>>32) & 0xffffffffL) == (id & 0xffffffffL)) {
logHeisenbug("B", id);
}
@@ -130,7 +131,7 @@
System.err.println(s);
Exception e = new Exception();
e.printStackTrace();
- Core.logger.log(NodeMessage.class, s, e, Core.logger.ERROR);
+ Core.logger.log(NodeMessage.class, s, e, Logger.ERROR);
}
return r;
}
Index: DataReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataReply.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- DataReply.java 30 Oct 2003 01:34:01 -0000 1.6
+++ DataReply.java 31 Oct 2003 18:13:16 -0000 1.7
@@ -9,6 +9,7 @@
import freenet.PeerHandler;
import freenet.Presentation;
import freenet.RawMessage;
+import freenet.support.Logger;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
It is distributed under the GNU Public Licence (GPL) version 2. See
@@ -34,7 +35,7 @@
FieldSet fs, long length) throws UnknownHostException {
super(idnum, fs, null, length);
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("new DataReply (a)");
else initException = null;
}
@@ -50,7 +51,7 @@
throws InvalidMessageException, BadAddressException {
super(source, raw);
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("new DataReply (b)");
else initException = null;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
