Author: toad Date: 2006-12-13 22:58:28 +0000 (Wed, 13 Dec 2006) New Revision: 11387
Added: trunk/freenet/src/freenet/support/api/ trunk/freenet/src/freenet/support/api/Bucket.java Removed: trunk/freenet/src/freenet/support/io/Bucket.java Modified: trunk/freenet/src/freenet/client/ArchiveHandler.java trunk/freenet/src/freenet/client/ArchiveManager.java trunk/freenet/src/freenet/client/ArchiveStoreContext.java trunk/freenet/src/freenet/client/ArchiveStoreItem.java trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java trunk/freenet/src/freenet/client/FECCodec.java trunk/freenet/src/freenet/client/FetchResult.java trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java trunk/freenet/src/freenet/client/InsertBlock.java trunk/freenet/src/freenet/client/Metadata.java trunk/freenet/src/freenet/client/RealArchiveStoreItem.java trunk/freenet/src/freenet/client/SplitfileBlock.java trunk/freenet/src/freenet/client/StandardOnionFECCodec.java trunk/freenet/src/freenet/client/async/ClientGetter.java trunk/freenet/src/freenet/client/async/ClientPutter.java trunk/freenet/src/freenet/client/async/HealingQueue.java trunk/freenet/src/freenet/client/async/ManifestElement.java trunk/freenet/src/freenet/client/async/MinimalSplitfileBlock.java trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java trunk/freenet/src/freenet/client/async/SingleBlockInserter.java trunk/freenet/src/freenet/client/async/SingleFileFetcher.java trunk/freenet/src/freenet/client/async/SingleFileInserter.java trunk/freenet/src/freenet/client/async/SplitFileFetcher.java trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java trunk/freenet/src/freenet/client/async/SplitFileInserter.java trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java trunk/freenet/src/freenet/client/async/USKFetcher.java trunk/freenet/src/freenet/client/async/USKInserter.java trunk/freenet/src/freenet/clients/http/ConfigToadlet.java trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java trunk/freenet/src/freenet/clients/http/FProxyToadlet.java trunk/freenet/src/freenet/clients/http/HTTPRequest.java trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java trunk/freenet/src/freenet/clients/http/NinjaSpider.java trunk/freenet/src/freenet/clients/http/PluginToadlet.java trunk/freenet/src/freenet/clients/http/PproxyToadlet.java trunk/freenet/src/freenet/clients/http/QueueToadlet.java trunk/freenet/src/freenet/clients/http/Spider.java trunk/freenet/src/freenet/clients/http/StaticToadlet.java trunk/freenet/src/freenet/clients/http/Toadlet.java trunk/freenet/src/freenet/clients/http/ToadletContext.java trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java trunk/freenet/src/freenet/clients/http/filter/CharsetExtractor.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/InsertableClientSSK.java trunk/freenet/src/freenet/keys/Key.java trunk/freenet/src/freenet/node/NodeARKInserter.java trunk/freenet/src/freenet/node/TextModeClientInterface.java trunk/freenet/src/freenet/node/fcp/AllDataMessage.java trunk/freenet/src/freenet/node/fcp/ClientGet.java trunk/freenet/src/freenet/node/fcp/ClientPut.java trunk/freenet/src/freenet/node/fcp/ClientPutDir.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/DiskDirPutFile.java trunk/freenet/src/freenet/node/fcp/FCPServer.java trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java trunk/freenet/src/freenet/support/compress/Compressor.java trunk/freenet/src/freenet/support/compress/GzipCompressor.java trunk/freenet/src/freenet/support/io/ArrayBucket.java trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java trunk/freenet/src/freenet/support/io/BucketFactory.java trunk/freenet/src/freenet/support/io/BucketTools.java trunk/freenet/src/freenet/support/io/FileBucket.java trunk/freenet/src/freenet/support/io/FileBucketFactory.java trunk/freenet/src/freenet/support/io/NullBucket.java trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.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/RandomAccessFileBucket.java trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucket.java trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java trunk/freenet/src/freenet/support/io/TempBucketFactory.java Log: Move Bucket to freenet.support.api Modified: trunk/freenet/src/freenet/client/ArchiveHandler.java =================================================================== --- trunk/freenet/src/freenet/client/ArchiveHandler.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/ArchiveHandler.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -3,7 +3,7 @@ * http://www.gnu.org/ for further details of the GPL. */ package freenet.client; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * @author toad Modified: trunk/freenet/src/freenet/client/ArchiveManager.java =================================================================== --- trunk/freenet/src/freenet/client/ArchiveManager.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/ArchiveManager.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -17,7 +17,7 @@ import freenet.keys.FreenetURI; import freenet.support.LRUHashtable; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketTools; import freenet.support.io.FileBucket; import freenet.support.io.FilenameGenerator; Modified: trunk/freenet/src/freenet/client/ArchiveStoreContext.java =================================================================== --- trunk/freenet/src/freenet/client/ArchiveStoreContext.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/ArchiveStoreContext.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -6,7 +6,7 @@ import freenet.keys.FreenetURI; import freenet.support.DoublyLinkedListImpl; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Tracks all files currently in the cache from a given key. Modified: trunk/freenet/src/freenet/client/ArchiveStoreItem.java =================================================================== --- trunk/freenet/src/freenet/client/ArchiveStoreItem.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/ArchiveStoreItem.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -4,7 +4,7 @@ package freenet.client; import freenet.support.DoublyLinkedListImpl; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Base class for items stored in the archive cache. Modified: trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java =================================================================== --- trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -4,7 +4,7 @@ package freenet.client; import freenet.keys.FreenetURI; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; class ErrorArchiveStoreItem extends ArchiveStoreItem { Modified: trunk/freenet/src/freenet/client/FECCodec.java =================================================================== --- trunk/freenet/src/freenet/client/FECCodec.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/FECCodec.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,7 +5,7 @@ import java.io.IOException; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; /** Modified: trunk/freenet/src/freenet/client/FetchResult.java =================================================================== --- trunk/freenet/src/freenet/client/FetchResult.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/FetchResult.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,7 +5,7 @@ import java.io.IOException; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketTools; /** Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java =================================================================== --- trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -19,7 +19,7 @@ import freenet.keys.FreenetURI; import freenet.node.NodeClientCore; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; import freenet.support.io.BucketTools; import freenet.support.io.NullPersistentFileTracker; Modified: trunk/freenet/src/freenet/client/InsertBlock.java =================================================================== --- trunk/freenet/src/freenet/client/InsertBlock.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/InsertBlock.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -4,7 +4,7 @@ package freenet.client; import freenet.keys.FreenetURI; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Class to contain everything needed for an insert. Modified: trunk/freenet/src/freenet/client/Metadata.java =================================================================== --- trunk/freenet/src/freenet/client/Metadata.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/Metadata.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -20,7 +20,7 @@ import freenet.keys.FreenetURI; import freenet.support.Fields; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; import freenet.support.io.BucketTools; Modified: trunk/freenet/src/freenet/client/RealArchiveStoreItem.java =================================================================== --- trunk/freenet/src/freenet/client/RealArchiveStoreItem.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/RealArchiveStoreItem.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -6,7 +6,7 @@ import java.io.File; import freenet.keys.FreenetURI; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.FileBucket; import freenet.support.io.FileUtil; import freenet.support.io.PaddedEphemerallyEncryptedBucket; Modified: trunk/freenet/src/freenet/client/SplitfileBlock.java =================================================================== --- trunk/freenet/src/freenet/client/SplitfileBlock.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/SplitfileBlock.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -1,6 +1,6 @@ package freenet.client; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public interface SplitfileBlock { Modified: trunk/freenet/src/freenet/client/StandardOnionFECCodec.java =================================================================== --- trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -16,7 +16,7 @@ import freenet.support.LRUHashtable; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; import freenet.support.io.BucketTools; Modified: trunk/freenet/src/freenet/client/async/ClientGetter.java =================================================================== --- trunk/freenet/src/freenet/client/async/ClientGetter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/ClientGetter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -14,7 +14,7 @@ import freenet.client.events.SplitfileProgressEvent; import freenet.keys.FreenetURI; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketTools; /** Modified: trunk/freenet/src/freenet/client/async/ClientPutter.java =================================================================== --- trunk/freenet/src/freenet/client/async/ClientPutter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/ClientPutter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -13,7 +13,7 @@ import freenet.keys.FreenetURI; import freenet.support.Logger; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public class ClientPutter extends BaseClientPutter implements PutCompletionCallback { Modified: trunk/freenet/src/freenet/client/async/HealingQueue.java =================================================================== --- trunk/freenet/src/freenet/client/async/HealingQueue.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/HealingQueue.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -3,7 +3,7 @@ * http://www.gnu.org/ for further details of the GPL. */ package freenet.client.async; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public interface HealingQueue { Modified: trunk/freenet/src/freenet/client/async/ManifestElement.java =================================================================== --- trunk/freenet/src/freenet/client/async/ManifestElement.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/ManifestElement.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -4,7 +4,7 @@ package freenet.client.async; import freenet.keys.FreenetURI; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Represents an element in a manifest. Fed to SimpleManifestPutter. Modified: trunk/freenet/src/freenet/client/async/MinimalSplitfileBlock.java =================================================================== --- trunk/freenet/src/freenet/client/async/MinimalSplitfileBlock.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/MinimalSplitfileBlock.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -1,7 +1,7 @@ package freenet.client.async; import freenet.client.SplitfileBlock; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public class MinimalSplitfileBlock implements SplitfileBlock { Modified: trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java =================================================================== --- trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -12,7 +12,7 @@ import freenet.keys.CHKBlock; import freenet.keys.FreenetURI; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public class SimpleHealingQueue extends BaseClientPutter implements HealingQueue, PutCompletionCallback { Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java =================================================================== --- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -22,7 +22,7 @@ import freenet.keys.BaseClientKey; import freenet.keys.FreenetURI; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketTools; public class SimpleManifestPutter extends BaseClientPutter implements PutCompletionCallback { Modified: trunk/freenet/src/freenet/client/async/SingleBlockInserter.java =================================================================== --- trunk/freenet/src/freenet/client/async/SingleBlockInserter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/SingleBlockInserter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -21,7 +21,7 @@ import freenet.node.SendableInsert; import freenet.support.Logger; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Insert *ONE KEY*. Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java =================================================================== --- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -27,9 +27,9 @@ import freenet.keys.USK; import freenet.node.LowLevelGetException; import freenet.support.Logger; +import freenet.support.api.Bucket; import freenet.support.compress.CompressionOutputSizeException; import freenet.support.compress.Compressor; -import freenet.support.io.Bucket; import freenet.support.io.BucketTools; public class SingleFileFetcher extends BaseSingleFileFetcher implements ClientGetState { Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java =================================================================== --- trunk/freenet/src/freenet/client/async/SingleFileInserter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -17,9 +17,9 @@ import freenet.keys.SSKBlock; import freenet.support.Logger; import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; import freenet.support.compress.CompressionOutputSizeException; import freenet.support.compress.Compressor; -import freenet.support.io.Bucket; import freenet.support.io.BucketTools; /** Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcher.java =================================================================== --- trunk/freenet/src/freenet/client/async/SplitFileFetcher.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/SplitFileFetcher.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -18,9 +18,9 @@ import freenet.keys.FreenetURI; import freenet.support.Fields; import freenet.support.Logger; +import freenet.support.api.Bucket; import freenet.support.compress.CompressionOutputSizeException; import freenet.support.compress.Compressor; -import freenet.support.io.Bucket; /** * Fetch a splitfile, decompress it if need be, and return it to the GetCompletionCallback. Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java =================================================================== --- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -18,7 +18,7 @@ import freenet.client.SplitfileBlock; import freenet.keys.FreenetURI; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketTools; /** Modified: trunk/freenet/src/freenet/client/async/SplitFileInserter.java =================================================================== --- trunk/freenet/src/freenet/client/async/SplitFileInserter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/SplitFileInserter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -16,8 +16,8 @@ import freenet.keys.FreenetURI; import freenet.support.Logger; import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; import freenet.support.compress.Compressor; -import freenet.support.io.Bucket; import freenet.support.io.BucketTools; public class SplitFileInserter implements ClientPutState { Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java =================================================================== --- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -14,7 +14,7 @@ import freenet.support.Fields; import freenet.support.Logger; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.CannotCreateFromFieldSetException; import freenet.support.io.SerializableToFieldSetBucket; import freenet.support.io.SerializableToFieldSetBucketUtil; Modified: trunk/freenet/src/freenet/client/async/USKFetcher.java =================================================================== --- trunk/freenet/src/freenet/client/async/USKFetcher.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/USKFetcher.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -16,7 +16,7 @@ import freenet.keys.USK; import freenet.node.RequestStarter; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Modified: trunk/freenet/src/freenet/client/async/USKInserter.java =================================================================== --- trunk/freenet/src/freenet/client/async/USKInserter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/client/async/USKInserter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -16,7 +16,7 @@ import freenet.keys.USK; import freenet.support.Logger; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketTools; /** Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -16,7 +16,7 @@ import freenet.support.HTMLNode; import freenet.support.Logger; import freenet.support.MultiValueTable; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; // FIXME: add logging, comments Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -35,7 +35,7 @@ import freenet.support.SimpleFieldSet; import freenet.support.SizeUtil; import freenet.support.TimeUtil; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public class DarknetConnectionsToadlet extends Toadlet { Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -35,7 +35,7 @@ import freenet.support.MultiValueTable; import freenet.support.SizeUtil; import freenet.support.URLEncoder; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.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-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/HTTPRequest.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -25,7 +25,7 @@ import freenet.support.MultiValueTable; import freenet.support.SimpleReadOnlyArrayBucket; import freenet.support.URLEncodedFormatException; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; import freenet.support.io.BucketTools; import freenet.support.io.LineReadingInputStream; Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -22,7 +22,7 @@ import freenet.support.Logger; import freenet.support.MultiValueTable; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public class N2NTMToadlet extends Toadlet { Modified: trunk/freenet/src/freenet/clients/http/NinjaSpider.java =================================================================== --- trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -51,7 +51,7 @@ import freenet.support.HTMLNode; import freenet.support.Logger; import freenet.support.MultiValueTable; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * NinjaSpider. Produces a ninj^W err ... an XML index. Modified: trunk/freenet/src/freenet/clients/http/PluginToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/PluginToadlet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/PluginToadlet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -13,7 +13,7 @@ import freenet.oldplugins.plugin.PluginManager; import freenet.support.HTMLNode; import freenet.support.MultiValueTable; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Toadlet for the plugin manager. @@ -99,7 +99,7 @@ } /** - * @see freenet.clients.http.Toadlet#handlePost(java.net.URI, freenet.support.io.Bucket, freenet.clients.http.ToadletContext) + * @see freenet.clients.http.Toadlet#handlePost(java.net.URI, freenet.support.api.Bucket, freenet.clients.http.ToadletContext) */ public void handlePost(URI uri, Bucket data, ToadletContext ctx) throws ToadletContextClosedException, IOException, RedirectException { HTTPRequest httpRequest = new HTTPRequest(uri, data, ctx); Modified: trunk/freenet/src/freenet/clients/http/PproxyToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/PproxyToadlet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/PproxyToadlet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -15,7 +15,7 @@ import freenet.support.HTMLNode; import freenet.support.Logger; import freenet.support.MultiValueTable; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public class PproxyToadlet extends Toadlet { private static final int MAX_PLUGIN_NAME_LENGTH = 1024; Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -31,7 +31,7 @@ import freenet.support.Logger; import freenet.support.MultiValueTable; import freenet.support.SizeUtil; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketTools; import freenet.support.io.FileBucket; Modified: trunk/freenet/src/freenet/clients/http/Spider.java =================================================================== --- trunk/freenet/src/freenet/clients/http/Spider.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/Spider.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -41,7 +41,7 @@ import freenet.support.HTMLNode; import freenet.support.Logger; import freenet.support.MultiValueTable; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Spider. Produces an index. Modified: trunk/freenet/src/freenet/clients/http/StaticToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/StaticToadlet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/StaticToadlet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -7,7 +7,7 @@ import freenet.client.DefaultMIMETypes; import freenet.client.HighLevelSimpleClient; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Static Toadlet. Modified: trunk/freenet/src/freenet/clients/http/Toadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/Toadlet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/Toadlet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -16,7 +16,7 @@ import freenet.support.HTMLEncoder; import freenet.support.HTMLNode; import freenet.support.MultiValueTable; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Replacement for servlets. Just an easy to use HTTP interface, which is Modified: trunk/freenet/src/freenet/clients/http/ToadletContext.java =================================================================== --- trunk/freenet/src/freenet/clients/http/ToadletContext.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/ToadletContext.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -4,7 +4,7 @@ import freenet.support.HTMLNode; import freenet.support.MultiValueTable; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; /** Modified: trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java =================================================================== --- trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -18,7 +18,7 @@ import freenet.support.Logger; import freenet.support.MultiValueTable; import freenet.support.URIPreEncoder; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; import freenet.support.io.BucketTools; import freenet.support.io.LineReadingInputStream; Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -26,7 +26,7 @@ import freenet.support.HTMLNode; import freenet.support.Logger; import freenet.support.MultiValueTable; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.frost.message.*; Modified: trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java =================================================================== --- trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -18,7 +18,7 @@ import freenet.support.HTMLEncoder; import freenet.support.HTMLNode; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; import freenet.support.io.NullWriter; Modified: trunk/freenet/src/freenet/clients/http/filter/CharsetExtractor.java =================================================================== --- trunk/freenet/src/freenet/clients/http/filter/CharsetExtractor.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/filter/CharsetExtractor.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,7 +5,7 @@ import java.io.IOException; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * For a specific text/-based MIME type, extracts the charset if Modified: trunk/freenet/src/freenet/clients/http/filter/ContentDataFilter.java =================================================================== --- trunk/freenet/src/freenet/clients/http/filter/ContentDataFilter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/filter/ContentDataFilter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -6,7 +6,7 @@ import java.io.IOException; import java.util.HashMap; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; /** Modified: trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java =================================================================== --- trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -12,7 +12,7 @@ import java.util.Hashtable; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; /** Modified: trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java =================================================================== --- trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -11,7 +11,7 @@ import java.util.HashMap; import freenet.support.HTMLNode; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; /** Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java =================================================================== --- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -28,7 +28,7 @@ import freenet.support.HTMLEncoder; import freenet.support.HTMLNode; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; import freenet.support.io.NullWriter; Modified: trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java =================================================================== --- trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -17,7 +17,7 @@ import freenet.support.HTMLNode; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.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-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -11,7 +11,7 @@ import java.util.HashMap; import freenet.support.HTMLNode; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; /** Modified: trunk/freenet/src/freenet/keys/ClientCHKBlock.java =================================================================== --- trunk/freenet/src/freenet/keys/ClientCHKBlock.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/keys/ClientCHKBlock.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -16,9 +16,9 @@ import freenet.crypt.ciphers.Rijndael; import freenet.keys.Key.Compressed; import freenet.node.Node; +import freenet.support.api.Bucket; import freenet.support.io.ArrayBucket; import freenet.support.io.ArrayBucketFactory; -import freenet.support.io.Bucket; 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-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/keys/ClientKeyBlock.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,7 +5,7 @@ import java.io.IOException; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; public interface ClientKeyBlock extends KeyBlock { Modified: trunk/freenet/src/freenet/keys/ClientSSKBlock.java =================================================================== --- trunk/freenet/src/freenet/keys/ClientSSKBlock.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/keys/ClientSSKBlock.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -8,7 +8,7 @@ import freenet.crypt.PCFBMode; import freenet.crypt.UnsupportedCipherException; import freenet.crypt.ciphers.Rijndael; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; import freenet.support.io.BucketTools; Modified: trunk/freenet/src/freenet/keys/InsertableClientSSK.java =================================================================== --- trunk/freenet/src/freenet/keys/InsertableClientSSK.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/keys/InsertableClientSSK.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -23,7 +23,7 @@ import freenet.crypt.UnsupportedCipherException; import freenet.crypt.ciphers.Rijndael; import freenet.keys.Key.Compressed; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public class InsertableClientSSK extends ClientSSK { Modified: trunk/freenet/src/freenet/keys/Key.java =================================================================== --- trunk/freenet/src/freenet/keys/Key.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/keys/Key.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -13,11 +13,11 @@ import freenet.support.Fields; import freenet.support.Logger; import freenet.support.SimpleReadOnlyArrayBucket; +import freenet.support.api.Bucket; import freenet.support.compress.CompressionOutputSizeException; import freenet.support.compress.Compressor; import freenet.support.io.ArrayBucket; import freenet.support.io.ArrayBucketFactory; -import freenet.support.io.Bucket; import freenet.support.io.BucketFactory; import freenet.support.io.BucketTools; Modified: trunk/freenet/src/freenet/node/NodeARKInserter.java =================================================================== --- trunk/freenet/src/freenet/node/NodeARKInserter.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/NodeARKInserter.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -20,7 +20,7 @@ import freenet.support.Logger; import freenet.support.SimpleFieldSet; import freenet.support.SimpleReadOnlyArrayBucket; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public class NodeARKInserter implements ClientCallback { Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java =================================================================== --- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -36,8 +36,8 @@ import freenet.support.HexUtil; import freenet.support.Logger; import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; import freenet.support.io.ArrayBucket; -import freenet.support.io.Bucket; import freenet.support.io.BucketTools; import freenet.support.io.FileBucket; Modified: trunk/freenet/src/freenet/node/fcp/AllDataMessage.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/AllDataMessage.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/AllDataMessage.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,7 +5,7 @@ import freenet.node.Node; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * All the data, all in one big chunk. Obviously we must already have Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/ClientGet.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/ClientGet.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -24,7 +24,7 @@ import freenet.support.HexUtil; import freenet.support.Logger; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketTools; import freenet.support.io.FileBucket; import freenet.support.io.NullBucket; Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/ClientPut.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/ClientPut.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -20,7 +20,7 @@ import freenet.support.Logger; import freenet.support.SimpleFieldSet; import freenet.support.SimpleReadOnlyArrayBucket; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.FileBucket; import freenet.support.io.PaddedEphemerallyEncryptedBucket; Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDir.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/ClientPutDir.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/ClientPutDir.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -20,7 +20,7 @@ import freenet.support.HexUtil; import freenet.support.Logger; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.FileBucket; import freenet.support.io.PaddedEphemerallyEncryptedBucket; Modified: trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -12,7 +12,7 @@ import freenet.node.RequestStarter; import freenet.support.Fields; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.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-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -8,7 +8,7 @@ import java.io.OutputStream; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.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-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/DirPutFile.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -8,7 +8,7 @@ import freenet.client.async.ManifestElement; import freenet.support.Logger; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; /** Modified: trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,7 +5,7 @@ import java.io.OutputStream; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; import freenet.support.io.BucketTools; Modified: trunk/freenet/src/freenet/node/fcp/DiskDirPutFile.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/DiskDirPutFile.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/DiskDirPutFile.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -7,7 +7,7 @@ import freenet.client.DefaultMIMETypes; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.FileBucket; public class DiskDirPutFile extends DirPutFile { Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -40,7 +40,7 @@ import freenet.node.RequestStarter; import freenet.support.Base64; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * FCP server process. Modified: trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -10,7 +10,7 @@ import freenet.keys.FreenetURI; import freenet.node.Node; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.FileBucket; import freenet.support.io.PaddedEphemerallyEncryptedBucket; Modified: trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -7,7 +7,7 @@ import freenet.keys.FreenetURI; import freenet.support.Logger; import freenet.support.SimpleFieldSet; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; public class RedirectDirPutFile extends DirPutFile { Modified: trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java =================================================================== --- trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,7 +5,7 @@ import java.io.InputStream; import java.io.OutputStream; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; /** * Simple read-only array bucket. Just an adapter class to save some RAM. Copied: trunk/freenet/src/freenet/support/api/Bucket.java (from rev 11380, trunk/freenet/src/freenet/support/io/Bucket.java) =================================================================== --- trunk/freenet/src/freenet/support/api/Bucket.java (rev 0) +++ trunk/freenet/src/freenet/support/api/Bucket.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -0,0 +1,53 @@ +/* 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.*; +/** + * A bucket is any arbitrary object can temporarily store data. + * + * @author oskar + */ +public interface Bucket { + + /** + * Returns an OutputStream that is used to put data in this Bucket, from the + * beginning. It is not possible to append data to a Bucket! This simplifies the + * code significantly for some classes. If you need to append, just pass the + * OutputStream around. + */ + public OutputStream getOutputStream() throws IOException; + + /** + * Returns an InputStream that reads data from this Bucket. If there is + * no data in this bucket, null is returned. + */ + public InputStream getInputStream() throws IOException; + + /** + * Returns a name for the bucket, may be used to identify them in + * certain in certain situations. + */ + public String getName(); + + /** + * Returns the amount of data currently in this bucket. + */ + public long size(); + + /** + * Is the bucket read-only? + */ + public boolean isReadOnly(); + + /** + * Make the bucket read-only. Irreversible. + */ + public void setReadOnly(); + + /** + * Free the bucket, if supported. + */ + public void free(); + +} Modified: trunk/freenet/src/freenet/support/compress/Compressor.java =================================================================== --- trunk/freenet/src/freenet/support/compress/Compressor.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/compress/Compressor.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -3,7 +3,7 @@ import java.io.IOException; import freenet.client.Metadata; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; /** Modified: trunk/freenet/src/freenet/support/compress/GzipCompressor.java =================================================================== --- trunk/freenet/src/freenet/support/compress/GzipCompressor.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/compress/GzipCompressor.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -9,7 +9,7 @@ import java.util.zip.GZIPOutputStream; import freenet.support.Logger; -import freenet.support.io.Bucket; +import freenet.support.api.Bucket; import freenet.support.io.BucketFactory; public class GzipCompressor extends Compressor { Modified: trunk/freenet/src/freenet/support/io/ArrayBucket.java =================================================================== --- trunk/freenet/src/freenet/support/io/ArrayBucket.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/ArrayBucket.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -8,6 +8,8 @@ import java.util.ArrayList; import java.util.Iterator; +import freenet.support.api.Bucket; + /** * A bucket that stores data in the memory. * Modified: trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java =================================================================== --- trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,6 +5,8 @@ import java.io.IOException; +import freenet.support.api.Bucket; + public class ArrayBucketFactory implements BucketFactory { public Bucket makeBucket(long size) throws IOException { Deleted: trunk/freenet/src/freenet/support/io/Bucket.java =================================================================== --- trunk/freenet/src/freenet/support/io/Bucket.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/Bucket.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -1,53 +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.*; -/** - * A bucket is any arbitrary object can temporarily store data. - * - * @author oskar - */ -public interface Bucket { - - /** - * Returns an OutputStream that is used to put data in this Bucket, from the - * beginning. It is not possible to append data to a Bucket! This simplifies the - * code significantly for some classes. If you need to append, just pass the - * OutputStream around. - */ - public OutputStream getOutputStream() throws IOException; - - /** - * Returns an InputStream that reads data from this Bucket. If there is - * no data in this bucket, null is returned. - */ - public InputStream getInputStream() throws IOException; - - /** - * Returns a name for the bucket, may be used to identify them in - * certain in certain situations. - */ - public String getName(); - - /** - * Returns the amount of data currently in this bucket. - */ - public long size(); - - /** - * Is the bucket read-only? - */ - public boolean isReadOnly(); - - /** - * Make the bucket read-only. Irreversible. - */ - public void setReadOnly(); - - /** - * Free the bucket, if supported. - */ - public void free(); - -} Modified: trunk/freenet/src/freenet/support/io/BucketFactory.java =================================================================== --- trunk/freenet/src/freenet/support/io/BucketFactory.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/BucketFactory.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,6 +5,8 @@ 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-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/BucketTools.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -15,6 +15,7 @@ import java.util.List; import freenet.crypt.SHA256; +import freenet.support.api.Bucket; /** * Helper functions for working with Buckets. Modified: trunk/freenet/src/freenet/support/io/FileBucket.java =================================================================== --- trunk/freenet/src/freenet/support/io/FileBucket.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/FileBucket.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -14,6 +14,7 @@ import freenet.crypt.RandomSource; import freenet.support.Logger; import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; /** * A file Bucket is an implementation of Bucket that writes to a file. Modified: trunk/freenet/src/freenet/support/io/FileBucketFactory.java =================================================================== --- trunk/freenet/src/freenet/support/io/FileBucketFactory.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/FileBucketFactory.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,6 +5,7 @@ import java.util.Vector; import freenet.support.Logger; +import freenet.support.api.Bucket; public class FileBucketFactory implements BucketFactory { Modified: trunk/freenet/src/freenet/support/io/NullBucket.java =================================================================== --- trunk/freenet/src/freenet/support/io/NullBucket.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/NullBucket.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -6,6 +6,7 @@ import java.io.OutputStream; import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; public class NullBucket implements Bucket, SerializableToFieldSetBucket { Modified: trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java =================================================================== --- trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -16,6 +16,7 @@ import freenet.support.HexUtil; import freenet.support.Logger; import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; /** * A proxy Bucket which adds: Modified: trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucketFactory.java =================================================================== --- trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucketFactory.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucketFactory.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -3,6 +3,7 @@ import java.io.IOException; import freenet.crypt.RandomSource; +import freenet.support.api.Bucket; /** * 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-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/PersistentEncryptedTempBucketFactory.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,7 +5,9 @@ import java.io.IOException; +import freenet.support.api.Bucket; + public class PersistentEncryptedTempBucketFactory implements BucketFactory { PersistentTempBucketFactory bf; Modified: trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java =================================================================== --- trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -11,6 +11,7 @@ import freenet.crypt.RandomSource; import freenet.support.Logger; +import freenet.support.api.Bucket; /** * Handles persistent temp files. These are used for e.g. persistent downloads. Modified: trunk/freenet/src/freenet/support/io/RandomAccessFileBucket.java =================================================================== --- trunk/freenet/src/freenet/support/io/RandomAccessFileBucket.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/RandomAccessFileBucket.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -10,6 +10,7 @@ import freenet.support.Logger; import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; /** * Bucket implementation that can efficiently access any arbitrary byte-range Modified: trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java =================================================================== --- trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -12,6 +12,7 @@ import java.io.RandomAccessFile; import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; /** Modified: trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucket.java =================================================================== --- trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucket.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucket.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -4,6 +4,7 @@ package freenet.support.io; import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; public interface SerializableToFieldSetBucket extends Bucket { Modified: trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java =================================================================== --- trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -5,6 +5,7 @@ import freenet.crypt.RandomSource; import freenet.support.SimpleFieldSet; +import freenet.support.api.Bucket; public class SerializableToFieldSetBucketUtil { Modified: trunk/freenet/src/freenet/support/io/TempBucketFactory.java =================================================================== --- trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2006-12-13 22:01:05 UTC (rev 11386) +++ trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2006-12-13 22:58:28 UTC (rev 11387) @@ -4,6 +4,7 @@ import java.io.IOException; import freenet.support.Logger; +import freenet.support.api.Bucket; /* * This code is part of FProxy, an HTTP proxy server for Freenet. It is
