Update of /cvsroot/freenet/freenet/src/freenet/client/http/filter
In directory sc8-pr-cvs1:/tmp/cvs-serv644/src/freenet/client/http/filter
Modified Files:
SaferFilter.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: SaferFilter.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/filter/SaferFilter.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -w -r1.53 -r1.54
--- SaferFilter.java 30 Oct 2003 01:34:04 -0000 1.53
+++ SaferFilter.java 31 Oct 2003 18:13:15 -0000 1.54
@@ -26,6 +26,7 @@
import freenet.support.BucketFactory;
import freenet.support.HTMLDecoder;
import freenet.support.HTMLEncoder;
+import freenet.support.Logger;
import freenet.support.NullBucket;
import freenet.support.io.NullInputStream;
@@ -132,7 +133,7 @@
} catch (Error e) {
if(e.getMessage().equals("Error: could not
match input")) { // this sucks, it should be a proper exception
Core.logger.log(this, "Invalid CSS!",
-
Core.logger.NORMAL);
+
Logger.NORMAL);
throw new
FilterException("CSSParseContext cannot parse CSS",
"The page contains invalid CSS code",
null);
@@ -182,12 +183,12 @@
}
void log(String s) {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
- Core.logger.log(this, s, Core.logger.DEBUG);
+ if(Core.logger.shouldLog(Logger.DEBUG))
+ Core.logger.log(this, s, Logger.DEBUG);
}
void logError(String s) {
- Core.logger.log(this, s, Core.logger.ERROR);
+ Core.logger.log(this, s, Logger.ERROR);
}
}
@@ -1134,7 +1135,7 @@
type = typesplit[0];
if (typesplit[1] != null && !typesplit[1].equals(""))
charset = typesplit[1];
- Core.logger.log(this, "Processing link tag, type=" +
type + ", charset=" + charset, Core.logger.DEBUG);
+ Core.logger.log(this, "Processing link tag, type=" +
type + ", charset=" + charset, Logger.DEBUG);
}
String c = getHashString(h, "charset");
if (c != null)
@@ -1159,7 +1160,7 @@
}
// Core.logger.log(this, "Sanitizing URI: "+href+" with
type "+
// type+" and charset "+charset,
-// Core.logger.DEBUG);
+// Logger.DEBUG);
href = HTMLDecoder.decode(href);
href = sanitizeURI(href, type, charset);
if (href != null) {
@@ -1313,26 +1314,26 @@
static String sanitizeStyle(String style) {
Core.logger.log(SaferFilter.class, "Sanitizing style: " + style,
- Core.logger.DEBUG);
+ Logger.DEBUG);
Reader r = new StringReader(style);
Writer w = new StringWriter();
CSSParseContext pc = new CSSParseContext(r, w, false);
try {
pc.parse();
} catch (IOException e) {
- Core.logger.log(SaferFilter.class, "IOException parsing inline
CSS!", Core.logger.ERROR);
+ Core.logger.log(SaferFilter.class, "IOException parsing inline
CSS!", Logger.ERROR);
} catch (Error e) {
if(e.getMessage().equals("Error: could not match input")) { //
this sucks, it should be a proper exception
- Core.logger.log(SaferFilter.class, "CSS Parse Error!",
e, Core.logger.NORMAL);
+ Core.logger.log(SaferFilter.class, "CSS Parse Error!",
e, Logger.NORMAL);
return "/* Could not match input style */";
} else throw e;
}
String s = w.toString();
if (s == null || s.equals(""))
return null;
-// Core.logger.log(SaferFilter.class, "Style now: " + s,
Core.logger.DEBUG);
+// Core.logger.log(SaferFilter.class, "Style now: " + s, Logger.DEBUG);
Core.logger.log(SaferFilter.class, "Style finally: " + s,
- Core.logger.DEBUG);
+ Logger.DEBUG);
return s;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
