Author: toad
Date: 2006-12-14 21:04:12 +0000 (Thu, 14 Dec 2006)
New Revision: 11407
Added:
trunk/freenet/src/freenet/support/api/BucketFactory.java
Removed:
trunk/freenet/src/freenet/support/io/BucketFactory.java
Modified:
trunk/freenet/src/freenet/client/FECCodec.java
trunk/freenet/src/freenet/client/FetcherContext.java
trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
trunk/freenet/src/freenet/client/InserterContext.java
trunk/freenet/src/freenet/client/Metadata.java
trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/HTTPRequest.java
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/clients/http/ToadletContext.java
trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
trunk/freenet/src/freenet/clients/http/filter/ContentDataFilter.java
trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
trunk/freenet/src/freenet/keys/ClientCHKBlock.java
trunk/freenet/src/freenet/keys/ClientKeyBlock.java
trunk/freenet/src/freenet/keys/ClientSSKBlock.java
trunk/freenet/src/freenet/keys/Key.java
trunk/freenet/src/freenet/node/NodeClientCore.java
trunk/freenet/src/freenet/node/fcp/BaseDataCarryingMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java
trunk/freenet/src/freenet/node/fcp/DirPutFile.java
trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
trunk/freenet/src/freenet/node/fcp/FCPMessage.java
trunk/freenet/src/freenet/support/compress/Compressor.java
trunk/freenet/src/freenet/support/compress/GzipCompressor.java
trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java
trunk/freenet/src/freenet/support/io/BucketTools.java
trunk/freenet/src/freenet/support/io/FileBucketFactory.java
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucketFactory.java
trunk/freenet/src/freenet/support/io/PersistentEncryptedTempBucketFactory.java
trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
trunk/freenet/src/freenet/support/io/TempBucketFactory.java
Log:
Move BucketFactory to freenet.support.api.
Modified: trunk/freenet/src/freenet/client/FECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/FECCodec.java 2006-12-14 21:02:01 UTC
(rev 11406)
+++ trunk/freenet/src/freenet/client/FECCodec.java 2006-12-14 21:04:12 UTC
(rev 11407)
@@ -6,7 +6,7 @@
import java.io.IOException;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
/**
* FEC (forward error correction) handler.
Modified: trunk/freenet/src/freenet/client/FetcherContext.java
===================================================================
--- trunk/freenet/src/freenet/client/FetcherContext.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/client/FetcherContext.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -8,7 +8,7 @@
import freenet.client.events.ClientEventProducer;
import freenet.client.events.SimpleEventProducer;
import freenet.crypt.RandomSource;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
/** Context for a Fetcher. Contains all the settings a Fetcher needs to know
about. */
public class FetcherContext implements Cloneable {
Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -20,7 +20,7 @@
import freenet.node.NodeClientCore;
import freenet.support.Logger;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.BucketTools;
import freenet.support.io.NullPersistentFileTracker;
import freenet.support.io.PersistentFileTracker;
Modified: trunk/freenet/src/freenet/client/InserterContext.java
===================================================================
--- trunk/freenet/src/freenet/client/InserterContext.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/client/InserterContext.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -8,7 +8,7 @@
import freenet.client.events.ClientEventProducer;
import freenet.client.events.SimpleEventProducer;
import freenet.crypt.RandomSource;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.NullPersistentFileTracker;
import freenet.support.io.PersistentFileTracker;
Modified: trunk/freenet/src/freenet/client/Metadata.java
===================================================================
--- trunk/freenet/src/freenet/client/Metadata.java 2006-12-14 21:02:01 UTC
(rev 11406)
+++ trunk/freenet/src/freenet/client/Metadata.java 2006-12-14 21:04:12 UTC
(rev 11407)
@@ -21,7 +21,7 @@
import freenet.support.Fields;
import freenet.support.Logger;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.BucketTools;
Modified: trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -17,7 +17,7 @@
import freenet.support.LRUHashtable;
import freenet.support.Logger;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.BucketTools;
/**
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -36,7 +36,7 @@
import freenet.support.SizeUtil;
import freenet.support.URLEncoder;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
public class FProxyToadlet extends Toadlet {
Modified: trunk/freenet/src/freenet/clients/http/HTTPRequest.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/HTTPRequest.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/HTTPRequest.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -26,7 +26,7 @@
import freenet.support.SimpleReadOnlyArrayBucket;
import freenet.support.URLEncodedFormatException;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.BucketTools;
import freenet.support.io.LineReadingInputStream;
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -32,7 +32,7 @@
import freenet.support.FileLoggerHook;
import freenet.support.Logger;
import freenet.support.FileLoggerHook.IntervalParseException;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.FilenameGenerator;
import freenet.support.io.TempBucketFactory;
Modified: trunk/freenet/src/freenet/clients/http/ToadletContext.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContext.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/ToadletContext.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -5,7 +5,7 @@
import freenet.support.HTMLNode;
import freenet.support.MultiValueTable;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
/**
* Object represents context for a single request. Is used as a token,
Modified: trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -19,7 +19,7 @@
import freenet.support.MultiValueTable;
import freenet.support.URIPreEncoder;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.BucketTools;
import freenet.support.io.LineReadingInputStream;
import freenet.support.io.TooLongException;
Modified: trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -19,7 +19,7 @@
import freenet.support.HTMLNode;
import freenet.support.Logger;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.NullWriter;
public class CSSReadFilter implements ContentDataFilter, CharsetExtractor {
Modified: trunk/freenet/src/freenet/clients/http/filter/ContentDataFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/ContentDataFilter.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/filter/ContentDataFilter.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -7,7 +7,7 @@
import java.util.HashMap;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
/**
* Data filter for a specific MIME type.
Modified: trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -13,7 +13,7 @@
import freenet.support.Logger;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
/**
* Freenet content filter. This doesn't actually do any filtering,
Modified: trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -12,7 +12,7 @@
import freenet.support.HTMLNode;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
/**
* Content filter for PNG's.
Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -29,7 +29,7 @@
import freenet.support.HTMLNode;
import freenet.support.Logger;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.NullWriter;
public class HTMLFilter implements ContentDataFilter, CharsetExtractor {
Modified: trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -18,7 +18,7 @@
import freenet.support.HTMLNode;
import freenet.support.Logger;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.CountedInputStream;
/**
Modified: trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -12,7 +12,7 @@
import freenet.support.HTMLNode;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
/**
* Content filter for PNG's.
Modified: trunk/freenet/src/freenet/keys/ClientCHKBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientCHKBlock.java 2006-12-14 21:02:01 UTC
(rev 11406)
+++ trunk/freenet/src/freenet/keys/ClientCHKBlock.java 2006-12-14 21:04:12 UTC
(rev 11407)
@@ -17,9 +17,9 @@
import freenet.keys.Key.Compressed;
import freenet.node.Node;
import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
import freenet.support.io.ArrayBucket;
import freenet.support.io.ArrayBucketFactory;
-import freenet.support.io.BucketFactory;
import freenet.support.io.BucketTools;
/**
Modified: trunk/freenet/src/freenet/keys/ClientKeyBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientKeyBlock.java 2006-12-14 21:02:01 UTC
(rev 11406)
+++ trunk/freenet/src/freenet/keys/ClientKeyBlock.java 2006-12-14 21:04:12 UTC
(rev 11407)
@@ -6,7 +6,7 @@
import java.io.IOException;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
public interface ClientKeyBlock extends KeyBlock {
Modified: trunk/freenet/src/freenet/keys/ClientSSKBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientSSKBlock.java 2006-12-14 21:02:01 UTC
(rev 11406)
+++ trunk/freenet/src/freenet/keys/ClientSSKBlock.java 2006-12-14 21:04:12 UTC
(rev 11407)
@@ -9,7 +9,7 @@
import freenet.crypt.UnsupportedCipherException;
import freenet.crypt.ciphers.Rijndael;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.BucketTools;
public class ClientSSKBlock extends SSKBlock implements ClientKeyBlock {
Modified: trunk/freenet/src/freenet/keys/Key.java
===================================================================
--- trunk/freenet/src/freenet/keys/Key.java 2006-12-14 21:02:01 UTC (rev
11406)
+++ trunk/freenet/src/freenet/keys/Key.java 2006-12-14 21:04:12 UTC (rev
11407)
@@ -14,11 +14,11 @@
import freenet.support.Logger;
import freenet.support.SimpleReadOnlyArrayBucket;
import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
import freenet.support.compress.CompressionOutputSizeException;
import freenet.support.compress.Compressor;
import freenet.support.io.ArrayBucket;
import freenet.support.io.ArrayBucketFactory;
-import freenet.support.io.BucketFactory;
import freenet.support.io.BucketTools;
/**
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2006-12-14 21:02:01 UTC
(rev 11406)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2006-12-14 21:04:12 UTC
(rev 11407)
@@ -46,7 +46,7 @@
import freenet.support.Base64;
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.FilenameGenerator;
import freenet.support.io.PaddedEphemerallyEncryptedBucketFactory;
import freenet.support.io.PersistentEncryptedTempBucketFactory;
Modified: trunk/freenet/src/freenet/node/fcp/BaseDataCarryingMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/BaseDataCarryingMessage.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/node/fcp/BaseDataCarryingMessage.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -4,7 +4,7 @@
import java.io.InputStream;
import java.io.OutputStream;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
public abstract class BaseDataCarryingMessage extends FCPMessage {
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -14,7 +14,7 @@
import freenet.node.Node;
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.PersistentTempBucketFactory;
/**
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -15,7 +15,7 @@
import freenet.support.Fields;
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.FileBucket;
/**
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -13,7 +13,7 @@
import freenet.support.Fields;
import freenet.support.SimpleFieldSet;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.FileBucket;
/**
Modified: trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -9,7 +9,7 @@
import freenet.support.Logger;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.BucketTools;
Modified: trunk/freenet/src/freenet/node/fcp/DirPutFile.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DirPutFile.java 2006-12-14 21:02:01 UTC
(rev 11406)
+++ trunk/freenet/src/freenet/node/fcp/DirPutFile.java 2006-12-14 21:04:12 UTC
(rev 11407)
@@ -9,7 +9,7 @@
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
/**
* A request to upload a file to a manifest.
Modified: trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -6,7 +6,7 @@
import freenet.support.SimpleFieldSet;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.BucketTools;
/**
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -5,7 +5,7 @@
import java.util.HashMap;
import freenet.support.Logger;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
public class FCPConnectionHandler {
Modified: trunk/freenet/src/freenet/node/fcp/FCPMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPMessage.java 2006-12-14 21:02:01 UTC
(rev 11406)
+++ trunk/freenet/src/freenet/node/fcp/FCPMessage.java 2006-12-14 21:04:12 UTC
(rev 11407)
@@ -5,7 +5,7 @@
import freenet.node.Node;
import freenet.support.SimpleFieldSet;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
import freenet.support.io.PersistentTempBucketFactory;
public abstract class FCPMessage {
Copied: trunk/freenet/src/freenet/support/api/BucketFactory.java (from rev
11395, trunk/freenet/src/freenet/support/io/BucketFactory.java)
===================================================================
--- trunk/freenet/src/freenet/support/api/BucketFactory.java
(rev 0)
+++ trunk/freenet/src/freenet/support/api/BucketFactory.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -0,0 +1,13 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+package freenet.support.api;
+
+import java.io.IOException;
+
+
+public interface BucketFactory {
+ public Bucket makeBucket(long size) throws IOException;
+ public void freeBucket(Bucket b) throws IOException;
+}
+
Modified: trunk/freenet/src/freenet/support/compress/Compressor.java
===================================================================
--- trunk/freenet/src/freenet/support/compress/Compressor.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/support/compress/Compressor.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -4,7 +4,7 @@
import freenet.client.Metadata;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
/**
* A data compressor. Contains methods to get all data compressors.
Modified: trunk/freenet/src/freenet/support/compress/GzipCompressor.java
===================================================================
--- trunk/freenet/src/freenet/support/compress/GzipCompressor.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/support/compress/GzipCompressor.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -10,7 +10,7 @@
import freenet.support.Logger;
import freenet.support.api.Bucket;
-import freenet.support.io.BucketFactory;
+import freenet.support.api.BucketFactory;
public class GzipCompressor extends Compressor {
Modified: trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -6,6 +6,7 @@
import java.io.IOException;
import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
public class ArrayBucketFactory implements BucketFactory {
Deleted: trunk/freenet/src/freenet/support/io/BucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketFactory.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/support/io/BucketFactory.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -1,14 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-package freenet.support.io;
-
-import java.io.IOException;
-
-import freenet.support.api.Bucket;
-
-public interface BucketFactory {
- public Bucket makeBucket(long size) throws IOException;
- public void freeBucket(Bucket b) throws IOException;
-}
-
Modified: trunk/freenet/src/freenet/support/io/BucketTools.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketTools.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/support/io/BucketTools.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -16,6 +16,7 @@
import freenet.crypt.SHA256;
import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
/**
* Helper functions for working with Buckets.
Modified: trunk/freenet/src/freenet/support/io/FileBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/FileBucketFactory.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/support/io/FileBucketFactory.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -6,6 +6,7 @@
import freenet.support.Logger;
import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
public class FileBucketFactory implements BucketFactory {
Modified:
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucketFactory.java
===================================================================
---
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucketFactory.java
2006-12-14 21:02:01 UTC (rev 11406)
+++
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucketFactory.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -4,6 +4,7 @@
import freenet.crypt.RandomSource;
import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
/**
* Factory wrapper for PaddedEphemerallyEncryptedBucket's, which are themselves
Modified:
trunk/freenet/src/freenet/support/io/PersistentEncryptedTempBucketFactory.java
===================================================================
---
trunk/freenet/src/freenet/support/io/PersistentEncryptedTempBucketFactory.java
2006-12-14 21:02:01 UTC (rev 11406)
+++
trunk/freenet/src/freenet/support/io/PersistentEncryptedTempBucketFactory.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -6,6 +6,7 @@
import java.io.IOException;
import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
public class PersistentEncryptedTempBucketFactory implements BucketFactory {
Modified: trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
2006-12-14 21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
2006-12-14 21:04:12 UTC (rev 11407)
@@ -12,6 +12,7 @@
import freenet.crypt.RandomSource;
import freenet.support.Logger;
import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
/**
* Handles persistent temp files. These are used for e.g. persistent downloads.
Modified: trunk/freenet/src/freenet/support/io/TempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2006-12-14
21:02:01 UTC (rev 11406)
+++ trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2006-12-14
21:04:12 UTC (rev 11407)
@@ -5,6 +5,7 @@
import freenet.support.Logger;
import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
/*
* This code is part of FProxy, an HTTP proxy server for Freenet. It is
