Author: j16sdiz
Date: 2009-02-13 15:38:57 +0000 (Fri, 13 Feb 2009)
New Revision: 25628
Modified:
trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
trunk/freenet/src/freenet/clients/http/filter/UnsafeContentTypeException.java
trunk/freenet/src/freenet/node/PeerNodeStatus.java
trunk/freenet/src/freenet/node/RequestTag.java
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListWithForeignIndex.java
Log:
even more warning fix
Modified: trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
2009-02-13 15:28:53 UTC (rev 25627)
+++ trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
2009-02-13 15:38:57 UTC (rev 25628)
@@ -29,9 +29,8 @@
{ (byte)'G', (byte)'I', (byte)'F', (byte)'8', (byte)'9',
(byte)'a' };
- public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
- HashMap otherParams, FilterCallback cb) throws
DataFilterException,
- IOException {
+ public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
HashMap<String, String> otherParams,
+ FilterCallback cb) throws DataFilterException, IOException {
if(data.size() < 6) {
throwHeaderError(l10n("tooShortTitle"),
l10n("tooShort"));
}
@@ -66,9 +65,8 @@
"<p>"+message+"</p>", new
HTMLNode("p").addChild("#", message));
}
- public Bucket writeFilter(Bucket data, BucketFactory bf, String charset,
- HashMap otherParams, FilterCallback cb) throws
DataFilterException,
- IOException {
+ public Bucket writeFilter(Bucket data, BucketFactory bf, String
charset, HashMap<String, String> otherParams,
+ FilterCallback cb) throws DataFilterException, IOException {
return null;
}
Modified: trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2009-02-13 15:28:53 UTC (rev 25627)
+++ trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2009-02-13 15:38:57 UTC (rev 25628)
@@ -61,9 +61,8 @@
(byte)'J', (byte)'F', (byte)'X', (byte)'X', 0
};
- public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
- HashMap otherParams, FilterCallback cb)
- throws DataFilterException, IOException {
+ public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
HashMap<String, String> otherParams,
+ FilterCallback cb) throws DataFilterException, IOException {
Bucket output = readFilter(data, bf, charset, otherParams, cb,
deleteComments, deleteExif, null);
if(output != null)
return output;
@@ -82,9 +81,9 @@
return filtered;
}
- public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
- HashMap otherParams, FilterCallback cb, boolean
deleteComments, boolean deleteExif, OutputStream output)
- throws DataFilterException, IOException {
+ public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
HashMap<String, String> otherParams,
+ FilterCallback cb, boolean deleteComments, boolean deleteExif,
OutputStream output)
+ throws DataFilterException, IOException {
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
long length = data.size();
if(length < 6) {
@@ -439,9 +438,8 @@
throw e;
}
- public Bucket writeFilter(Bucket data, BucketFactory bf, String charset,
- HashMap otherParams, FilterCallback cb) throws
DataFilterException,
- IOException {
+ public Bucket writeFilter(Bucket data, BucketFactory bf, String
charset, HashMap<String, String> otherParams,
+ FilterCallback cb) throws DataFilterException, IOException {
return null;
}
Modified: trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
2009-02-13 15:28:53 UTC (rev 25627)
+++ trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
2009-02-13 15:38:57 UTC (rev 25628)
@@ -75,9 +75,8 @@
this.checkCRCs = checkCRCs;
}
- public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
- HashMap otherParams, FilterCallback cb) throws
DataFilterException,
- IOException {
+ public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
HashMap<String, String> otherParams,
+ FilterCallback cb) throws DataFilterException, IOException {
Bucket output = readFilter(data, bf, charset, otherParams, cb,
deleteText, deleteTimestamp, checkCRCs, null);
if(output != null)
return output;
@@ -96,9 +95,9 @@
return filtered;
}
- public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
- HashMap otherParams, FilterCallback cb, boolean deleteText,
boolean deleteTimestamp, boolean checkCRCs, OutputStream output) throws
DataFilterException,
- IOException {
+ public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
HashMap<String, String> otherParams,
+ FilterCallback cb, boolean deleteText, boolean deleteTimestamp,
boolean checkCRCs, OutputStream output)
+ throws DataFilterException, IOException {
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
boolean logDEBUG = Logger.shouldLog(Logger.DEBUG, this);
InputStream is = null;
@@ -289,9 +288,8 @@
return L10n.getString("PNGFilter." + key);
}
- public Bucket writeFilter(Bucket data, BucketFactory bf, String charset,
- HashMap otherParams, FilterCallback cb) throws
DataFilterException,
- IOException {
+ public Bucket writeFilter(Bucket data, BucketFactory bf, String
charset, HashMap<String, String> otherParams,
+ FilterCallback cb) throws DataFilterException, IOException {
// TODO Auto-generated method stub
return null;
}
Modified:
trunk/freenet/src/freenet/clients/http/filter/UnsafeContentTypeException.java
===================================================================
---
trunk/freenet/src/freenet/clients/http/filter/UnsafeContentTypeException.java
2009-02-13 15:28:53 UTC (rev 25627)
+++
trunk/freenet/src/freenet/clients/http/filter/UnsafeContentTypeException.java
2009-02-13 15:38:57 UTC (rev 25628)
@@ -14,6 +14,7 @@
* Base class for UnknownContentTypeException and
KnownUnsafeContentTypeException.
*/
public abstract class UnsafeContentTypeException extends IOException {
+ private static final long serialVersionUID = 1L;
/**
* Get the contents of the error page.
Modified: trunk/freenet/src/freenet/node/PeerNodeStatus.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNodeStatus.java 2009-02-13 15:28:53 UTC
(rev 25627)
+++ trunk/freenet/src/freenet/node/PeerNodeStatus.java 2009-02-13 15:38:57 UTC
(rev 25628)
@@ -8,7 +8,6 @@
import freenet.clients.http.DarknetConnectionsToadlet;
import freenet.io.comm.Peer;
import freenet.io.xfer.PacketThrottle;
-import freenet.support.Logger;
/**
* Contains various status information for a {...@link PeerNode}. Used e.g. in
Modified: trunk/freenet/src/freenet/node/RequestTag.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestTag.java 2009-02-13 15:28:53 UTC
(rev 25627)
+++ trunk/freenet/src/freenet/node/RequestTag.java 2009-02-13 15:38:57 UTC
(rev 25628)
@@ -2,12 +2,12 @@
import java.lang.ref.WeakReference;
-import freenet.io.comm.NotConnectedException;
import freenet.support.Logger;
import freenet.support.TimeUtil;
/**
* Tag for a request.
+ *
* @author Matthew Toseland <[email protected]> (0xE43DA450)
*/
public class RequestTag extends UIDTag {
Modified:
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListWithForeignIndex.java
===================================================================
---
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListWithForeignIndex.java
2009-02-13 15:28:53 UTC (rev 25627)
+++
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListWithForeignIndex.java
2009-02-13 15:38:57 UTC (rev 25628)
@@ -1,7 +1,6 @@
package freenet.support;
import java.util.HashMap;
-import java.util.Iterator;
/**
* UpdatableSortedLinkedList plus a hashtable. Each item has
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
