[freenet-cvs] r10490 - in trunk/freenet/src: freenet/client freenet/client/async freenet/client/events freenet/clients/http freenet/clients/http/filter freenet/config freenet/crypt freenet/crypt/ciphers freenet/frost/message freenet/io freenet/io/comm freenet/io/xfer freenet/keys freenet/node freenet/node/fcp freenet/node/updater freenet/node/useralerts freenet/plugin freenet/pluginmanager freenet/store freenet/support freenet/support/CPUInformation freenet/support/compress freenet/support/io freenet/support/math freenet/tools freenet/transport test

Wed, 20 Sep 2006 00:11:18 +0000 (UTC) 

Author: toad
Date: 2006-09-20 00:07:46 +0000 (Wed, 20 Sep 2006)
New Revision: 10490

Modified:
   trunk/freenet/src/freenet/client/ArchiveContext.java
   trunk/freenet/src/freenet/client/ArchiveFailureException.java
   trunk/freenet/src/freenet/client/ArchiveHandler.java
   trunk/freenet/src/freenet/client/ArchiveKey.java
   trunk/freenet/src/freenet/client/ArchiveManager.java
   trunk/freenet/src/freenet/client/ArchiveRestartException.java
   trunk/freenet/src/freenet/client/ArchiveStoreContext.java
   trunk/freenet/src/freenet/client/ArchiveStoreItem.java
   trunk/freenet/src/freenet/client/ClientMetadata.java
   trunk/freenet/src/freenet/client/DefaultMIMETypes.java
   trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java
   trunk/freenet/src/freenet/client/FECCodec.java
   trunk/freenet/src/freenet/client/FailureCodeTracker.java
   trunk/freenet/src/freenet/client/FetchException.java
   trunk/freenet/src/freenet/client/FetchResult.java
   trunk/freenet/src/freenet/client/FetchWaiter.java
   trunk/freenet/src/freenet/client/FetcherContext.java
   trunk/freenet/src/freenet/client/HighLevelSimpleClient.java
   trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
   trunk/freenet/src/freenet/client/InsertBlock.java
   trunk/freenet/src/freenet/client/InserterContext.java
   trunk/freenet/src/freenet/client/InserterException.java
   trunk/freenet/src/freenet/client/Metadata.java
   trunk/freenet/src/freenet/client/MetadataParseException.java
   trunk/freenet/src/freenet/client/MetadataUnresolvedException.java
   trunk/freenet/src/freenet/client/PutWaiter.java
   trunk/freenet/src/freenet/client/RealArchiveStoreItem.java
   trunk/freenet/src/freenet/client/SplitFetchException.java
   trunk/freenet/src/freenet/client/SplitfileBlock.java
   trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
   trunk/freenet/src/freenet/client/StartableSplitfileBlock.java
   trunk/freenet/src/freenet/client/TempStoreElement.java
   trunk/freenet/src/freenet/client/async/BaseClientGetter.java
   trunk/freenet/src/freenet/client/async/BaseClientPutter.java
   trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
   trunk/freenet/src/freenet/client/async/ClientCallback.java
   trunk/freenet/src/freenet/client/async/ClientGetState.java
   trunk/freenet/src/freenet/client/async/ClientGetter.java
   trunk/freenet/src/freenet/client/async/ClientPutState.java
   trunk/freenet/src/freenet/client/async/ClientPutter.java
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
   trunk/freenet/src/freenet/client/async/ClientRequester.java
   trunk/freenet/src/freenet/client/async/GetCompletionCallback.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/MultiPutCompletionCallback.java
   trunk/freenet/src/freenet/client/async/PutCompletionCallback.java
   trunk/freenet/src/freenet/client/async/ResumeException.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/USKCallback.java
   trunk/freenet/src/freenet/client/async/USKChecker.java
   trunk/freenet/src/freenet/client/async/USKCheckerCallback.java
   trunk/freenet/src/freenet/client/async/USKFetcher.java
   trunk/freenet/src/freenet/client/async/USKFetcherCallback.java
   trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java
   trunk/freenet/src/freenet/client/async/USKInserter.java
   trunk/freenet/src/freenet/client/async/USKManager.java
   trunk/freenet/src/freenet/client/async/USKProxyCompletionCallback.java
   trunk/freenet/src/freenet/client/async/USKRetriever.java
   trunk/freenet/src/freenet/client/async/USKRetrieverCallback.java
   trunk/freenet/src/freenet/client/events/BlockInsertErrorEvent.java
   trunk/freenet/src/freenet/client/events/ClientEvent.java
   trunk/freenet/src/freenet/client/events/ClientEventListener.java
   trunk/freenet/src/freenet/client/events/ClientEventProducer.java
   trunk/freenet/src/freenet/client/events/DecodedBlockEvent.java
   trunk/freenet/src/freenet/client/events/EventDumper.java
   trunk/freenet/src/freenet/client/events/EventLogger.java
   trunk/freenet/src/freenet/client/events/FetchedMetadataEvent.java
   trunk/freenet/src/freenet/client/events/FinishedCompressionEvent.java
   trunk/freenet/src/freenet/client/events/GeneratedURIEvent.java
   trunk/freenet/src/freenet/client/events/GotBlockEvent.java
   trunk/freenet/src/freenet/client/events/SimpleBlockPutEvent.java
   trunk/freenet/src/freenet/client/events/SimpleEventProducer.java
   trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java
   trunk/freenet/src/freenet/client/events/StartedCompressionEvent.java
   trunk/freenet/src/freenet/clients/http/Bookmark.java
   trunk/freenet/src/freenet/clients/http/BookmarkManager.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/LocalFileInsertToadlet.java
   trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
   trunk/freenet/src/freenet/clients/http/NinjaSpider.java
   trunk/freenet/src/freenet/clients/http/PageMaker.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/RedirectException.java
   trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
   trunk/freenet/src/freenet/clients/http/Spider.java
   trunk/freenet/src/freenet/clients/http/StaticToadlet.java
   trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java
   trunk/freenet/src/freenet/clients/http/Toadlet.java
   trunk/freenet/src/freenet/clients/http/ToadletContainer.java
   trunk/freenet/src/freenet/clients/http/ToadletContext.java
   trunk/freenet/src/freenet/clients/http/ToadletContextClosedException.java
   trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
   trunk/freenet/src/freenet/clients/http/TrivialToadlet.java
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
   trunk/freenet/src/freenet/clients/http/filter/CSSParser.java
   trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
   trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
   trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex
   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/DataFilterException.java
   trunk/freenet/src/freenet/clients/http/filter/FilterCallback.java
   trunk/freenet/src/freenet/clients/http/filter/FoundURICallback.java
   trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
   trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
   
trunk/freenet/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java
   trunk/freenet/src/freenet/clients/http/filter/MIMEType.java
   trunk/freenet/src/freenet/clients/http/filter/NullFilterCallback.java
   
trunk/freenet/src/freenet/clients/http/filter/UnknownContentTypeException.java
   trunk/freenet/src/freenet/clients/http/filter/UnsafeContentTypeException.java
   trunk/freenet/src/freenet/clients/http/filter/Yytoken.java
   trunk/freenet/src/freenet/config/BooleanCallback.java
   trunk/freenet/src/freenet/config/BooleanOption.java
   trunk/freenet/src/freenet/config/Config.java
   trunk/freenet/src/freenet/config/FilePersistentConfig.java
   trunk/freenet/src/freenet/config/IntCallback.java
   trunk/freenet/src/freenet/config/IntOption.java
   trunk/freenet/src/freenet/config/InvalidConfigValueException.java
   trunk/freenet/src/freenet/config/LongCallback.java
   trunk/freenet/src/freenet/config/LongOption.java
   trunk/freenet/src/freenet/config/Option.java
   trunk/freenet/src/freenet/config/OptionFormatException.java
   trunk/freenet/src/freenet/config/ShortCallback.java
   trunk/freenet/src/freenet/config/ShortOption.java
   trunk/freenet/src/freenet/config/StringArrCallback.java
   trunk/freenet/src/freenet/config/StringArrOption.java
   trunk/freenet/src/freenet/config/StringCallback.java
   trunk/freenet/src/freenet/config/StringOption.java
   trunk/freenet/src/freenet/config/SubConfig.java
   trunk/freenet/src/freenet/crypt/BlockCipher.java
   trunk/freenet/src/freenet/crypt/CipherInputStream.java
   trunk/freenet/src/freenet/crypt/CipherModes.java
   trunk/freenet/src/freenet/crypt/CipherOutputStream.java
   trunk/freenet/src/freenet/crypt/CryptoElement.java
   trunk/freenet/src/freenet/crypt/CryptoKey.java
   trunk/freenet/src/freenet/crypt/DHGroup.java
   trunk/freenet/src/freenet/crypt/DSA.java
   trunk/freenet/src/freenet/crypt/DSAGroup.java
   trunk/freenet/src/freenet/crypt/DSAGroupGenerator.java
   trunk/freenet/src/freenet/crypt/DSAPrivateKey.java
   trunk/freenet/src/freenet/crypt/DSAPublicKey.java
   trunk/freenet/src/freenet/crypt/DSASignature.java
   trunk/freenet/src/freenet/crypt/DecipherOutputStream.java
   trunk/freenet/src/freenet/crypt/DecryptionFailedException.java
   trunk/freenet/src/freenet/crypt/DiffieHellman.java
   trunk/freenet/src/freenet/crypt/DiffieHellmanContext.java
   trunk/freenet/src/freenet/crypt/Digest.java
   trunk/freenet/src/freenet/crypt/DigestFactory.java
   trunk/freenet/src/freenet/crypt/DigestInputStream.java
   trunk/freenet/src/freenet/crypt/DigestOutputStream.java
   trunk/freenet/src/freenet/crypt/DummyRandomSource.java
   trunk/freenet/src/freenet/crypt/EncipherInputStream.java
   trunk/freenet/src/freenet/crypt/EntropySource.java
   trunk/freenet/src/freenet/crypt/Global.java
   trunk/freenet/src/freenet/crypt/HMAC.java
   trunk/freenet/src/freenet/crypt/JavaSHA1.java
   trunk/freenet/src/freenet/crypt/KEProtocol.java
   trunk/freenet/src/freenet/crypt/KeyAgreementSchemeContext.java
   trunk/freenet/src/freenet/crypt/PCFBMode.java
   trunk/freenet/src/freenet/crypt/RandomSource.java
   trunk/freenet/src/freenet/crypt/SHA1Factory.java
   trunk/freenet/src/freenet/crypt/StationToStationContext.java
   trunk/freenet/src/freenet/crypt/UnsupportedCipherException.java
   trunk/freenet/src/freenet/crypt/UnsupportedDigestException.java
   trunk/freenet/src/freenet/crypt/Util.java
   trunk/freenet/src/freenet/crypt/Yarrow.java
   trunk/freenet/src/freenet/crypt/ciphers/Rijndael.java
   trunk/freenet/src/freenet/crypt/ciphers/Twofish.java
   trunk/freenet/src/freenet/frost/message/FrostBoard.java
   trunk/freenet/src/freenet/frost/message/FrostMessage.java
   trunk/freenet/src/freenet/io/AddressIdentifier.java
   trunk/freenet/src/freenet/io/AddressMatcher.java
   trunk/freenet/src/freenet/io/Inet4AddressMatcher.java
   trunk/freenet/src/freenet/io/Inet6AddressMatcher.java
   trunk/freenet/src/freenet/io/NetworkInterface.java
   trunk/freenet/src/freenet/io/WritableToDataOutputStream.java
   trunk/freenet/src/freenet/io/comm/DMT.java
   trunk/freenet/src/freenet/io/comm/DisconnectedException.java
   trunk/freenet/src/freenet/io/comm/Dispatcher.java
   trunk/freenet/src/freenet/io/comm/DummyPeerContext.java
   trunk/freenet/src/freenet/io/comm/DumpDispatcher.java
   trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
   trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java
   trunk/freenet/src/freenet/io/comm/IncorrectTypeException.java
   trunk/freenet/src/freenet/io/comm/LowLevelFilter.java
   trunk/freenet/src/freenet/io/comm/LowLevelFilterException.java
   trunk/freenet/src/freenet/io/comm/Message.java
   trunk/freenet/src/freenet/io/comm/MessageFilter.java
   trunk/freenet/src/freenet/io/comm/MessageType.java
   trunk/freenet/src/freenet/io/comm/NotConnectedException.java
   trunk/freenet/src/freenet/io/comm/Peer.java
   trunk/freenet/src/freenet/io/comm/PeerContext.java
   trunk/freenet/src/freenet/io/comm/PeerParseException.java
   
trunk/freenet/src/freenet/io/comm/ReferenceSignatureVerificationException.java
   trunk/freenet/src/freenet/io/comm/RetrievalException.java
   trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
   trunk/freenet/src/freenet/io/xfer/AbortedException.java
   trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
   trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
   trunk/freenet/src/freenet/io/xfer/PacketThrottle.java
   trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBlock.java
   trunk/freenet/src/freenet/keys/BaseClientKey.java
   trunk/freenet/src/freenet/keys/CHKBlock.java
   trunk/freenet/src/freenet/keys/CHKDecodeException.java
   trunk/freenet/src/freenet/keys/CHKEncodeException.java
   trunk/freenet/src/freenet/keys/CHKVerifyException.java
   trunk/freenet/src/freenet/keys/ClientCHK.java
   trunk/freenet/src/freenet/keys/ClientCHKBlock.java
   trunk/freenet/src/freenet/keys/ClientKSK.java
   trunk/freenet/src/freenet/keys/ClientKey.java
   trunk/freenet/src/freenet/keys/ClientKeyBlock.java
   trunk/freenet/src/freenet/keys/ClientSSK.java
   trunk/freenet/src/freenet/keys/ClientSSKBlock.java
   trunk/freenet/src/freenet/keys/FreenetURI.java
   trunk/freenet/src/freenet/keys/InsertableClientSSK.java
   trunk/freenet/src/freenet/keys/InsertableUSK.java
   trunk/freenet/src/freenet/keys/Key.java
   trunk/freenet/src/freenet/keys/KeyBlock.java
   trunk/freenet/src/freenet/keys/KeyDecodeException.java
   trunk/freenet/src/freenet/keys/KeyEncodeException.java
   trunk/freenet/src/freenet/keys/KeyVerifyException.java
   trunk/freenet/src/freenet/keys/NodeCHK.java
   trunk/freenet/src/freenet/keys/NodeSSK.java
   trunk/freenet/src/freenet/keys/SSKBlock.java
   trunk/freenet/src/freenet/keys/SSKDecodeException.java
   trunk/freenet/src/freenet/keys/SSKEncodeException.java
   trunk/freenet/src/freenet/keys/SSKVerifyException.java
   trunk/freenet/src/freenet/keys/USK.java
   trunk/freenet/src/freenet/node/AnyInsertSender.java
   trunk/freenet/src/freenet/node/AsyncMessageCallback.java
   trunk/freenet/src/freenet/node/BaseRequestThrottle.java
   trunk/freenet/src/freenet/node/ByteCounter.java
   trunk/freenet/src/freenet/node/CHKInsertSender.java
   trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
   trunk/freenet/src/freenet/node/CPUUsageMonitor.java
   trunk/freenet/src/freenet/node/DNSRequester.java
   trunk/freenet/src/freenet/node/DSAPublicKeyDatabase.java
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
   trunk/freenet/src/freenet/node/FSParseException.java
   trunk/freenet/src/freenet/node/FastRunnable.java
   trunk/freenet/src/freenet/node/GlobalProbe.java
   trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
   trunk/freenet/src/freenet/node/InsertHandler.java
   trunk/freenet/src/freenet/node/KeyChangedException.java
   trunk/freenet/src/freenet/node/KeyTracker.java
   trunk/freenet/src/freenet/node/Location.java
   trunk/freenet/src/freenet/node/LocationManager.java
   trunk/freenet/src/freenet/node/LoggingConfigHandler.java
   trunk/freenet/src/freenet/node/LowLevelGetException.java
   trunk/freenet/src/freenet/node/LowLevelPutException.java
   trunk/freenet/src/freenet/node/MemoryChecker.java
   trunk/freenet/src/freenet/node/MessageItem.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/NodeARKInserter.java
   trunk/freenet/src/freenet/node/NodeClientCore.java
   trunk/freenet/src/freenet/node/NodeDispatcher.java
   trunk/freenet/src/freenet/node/NodeIPDetector.java
   trunk/freenet/src/freenet/node/NodePinger.java
   trunk/freenet/src/freenet/node/NodeStarter.java
   trunk/freenet/src/freenet/node/PacketSender.java
   trunk/freenet/src/freenet/node/PacketSequenceException.java
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/PeerNodeStatus.java
   trunk/freenet/src/freenet/node/ProbeCallback.java
   trunk/freenet/src/freenet/node/RealNodePingTest.java
   trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java
   trunk/freenet/src/freenet/node/RealNodeRoutingTest.java
   trunk/freenet/src/freenet/node/RequestHandler.java
   trunk/freenet/src/freenet/node/RequestScheduler.java
   trunk/freenet/src/freenet/node/RequestSender.java
   trunk/freenet/src/freenet/node/RequestStarter.java
   trunk/freenet/src/freenet/node/RequestStarterGroup.java
   trunk/freenet/src/freenet/node/ResendPacketItem.java
   trunk/freenet/src/freenet/node/RoutingContext.java
   trunk/freenet/src/freenet/node/SSKInsertHandler.java
   trunk/freenet/src/freenet/node/SSKInsertSender.java
   trunk/freenet/src/freenet/node/SendMessageOnErrorCallback.java
   trunk/freenet/src/freenet/node/SendableGet.java
   trunk/freenet/src/freenet/node/SendableInsert.java
   trunk/freenet/src/freenet/node/SendableRequest.java
   trunk/freenet/src/freenet/node/SimpleSendableInsert.java
   trunk/freenet/src/freenet/node/StaticSwapRequestInterval.java
   trunk/freenet/src/freenet/node/SwapRequestInterval.java
   trunk/freenet/src/freenet/node/TestnetHandler.java
   trunk/freenet/src/freenet/node/TestnetStatusUploader.java
   trunk/freenet/src/freenet/node/TextModeClientInterface.java
   trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
   trunk/freenet/src/freenet/node/ThrottleWindowManager.java
   trunk/freenet/src/freenet/node/Ticker.java
   trunk/freenet/src/freenet/node/fcp/AddPeer.java
   trunk/freenet/src/freenet/node/fcp/AllDataMessage.java
   trunk/freenet/src/freenet/node/fcp/BaseDataCarryingMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientGet.java
   trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
   trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
   trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientPutDir.java
   trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
   trunk/freenet/src/freenet/node/fcp/ClientRequest.java
   
trunk/freenet/src/freenet/node/fcp/CloseConnectionDuplicateClientNameMessage.java
   trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java
   trunk/freenet/src/freenet/node/fcp/DataFoundMessage.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/EndListPeersMessage.java
   trunk/freenet/src/freenet/node/fcp/EndListPersistentRequestsMessage.java
   trunk/freenet/src/freenet/node/fcp/FCPClient.java
   trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
   trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
   trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java
   trunk/freenet/src/freenet/node/fcp/FCPMessage.java
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
   trunk/freenet/src/freenet/node/fcp/FinishedCompressionMessage.java
   trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java
   trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java
   trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java
   trunk/freenet/src/freenet/node/fcp/IdentifierCollisionException.java
   trunk/freenet/src/freenet/node/fcp/IdentifierCollisionMessage.java
   trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java
   trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
   trunk/freenet/src/freenet/node/fcp/MessageInvalidException.java
   trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
   trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
   trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java
   trunk/freenet/src/freenet/node/fcp/Peer.java
   trunk/freenet/src/freenet/node/fcp/PeerRemoved.java
   trunk/freenet/src/freenet/node/fcp/PersistenceParseException.java
   trunk/freenet/src/freenet/node/fcp/PersistentGet.java
   trunk/freenet/src/freenet/node/fcp/PersistentPut.java
   trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
   trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java
   trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java
   trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java
   trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java
   trunk/freenet/src/freenet/node/fcp/RemovePeer.java
   trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java
   trunk/freenet/src/freenet/node/fcp/SSKKeypairMessage.java
   trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java
   trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java
   trunk/freenet/src/freenet/node/fcp/StartedCompressionMessage.java
   trunk/freenet/src/freenet/node/fcp/SubscribeUSK.java
   trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java
   trunk/freenet/src/freenet/node/fcp/SubscribedUSKUpdate.java
   trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java
   trunk/freenet/src/freenet/node/fcp/WatchGlobal.java
   trunk/freenet/src/freenet/node/updater/AutoUpdateAllowedCallback.java
   trunk/freenet/src/freenet/node/updater/NodeUpdater.java
   trunk/freenet/src/freenet/node/updater/PrivkeyHasBeenBlownException.java
   trunk/freenet/src/freenet/node/updater/UpdateRevocationURICallback.java
   trunk/freenet/src/freenet/node/updater/UpdateURICallback.java
   trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java
   trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
   trunk/freenet/src/freenet/node/useralerts/ExtOldAgeUserAlert.java
   trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
   trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
   trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
   trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
   trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java
   trunk/freenet/src/freenet/node/useralerts/SimpleUserAlert.java
   
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
   trunk/freenet/src/freenet/node/useralerts/UserAlert.java
   trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
   trunk/freenet/src/freenet/plugin/HttpPlugin.java
   trunk/freenet/src/freenet/plugin/Plugin.java
   trunk/freenet/src/freenet/plugin/PluginManager.java
   trunk/freenet/src/freenet/plugin/TestHttpPlugin.java
   trunk/freenet/src/freenet/plugin/TestPlugin.java
   trunk/freenet/src/freenet/pluginmanager/DetectedIP.java
   trunk/freenet/src/freenet/pluginmanager/FredPlugin.java
   trunk/freenet/src/freenet/pluginmanager/FredPluginHTTP.java
   trunk/freenet/src/freenet/pluginmanager/FredPluginIPDetector.java
   trunk/freenet/src/freenet/pluginmanager/FredPluginThreadless.java
   trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java
   trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
   trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
   trunk/freenet/src/freenet/pluginmanager/PluginManager.java
   trunk/freenet/src/freenet/pluginmanager/PluginNotFoundException.java
   trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java
   trunk/freenet/src/freenet/pluginmanager/PluginSecurityException.java
   trunk/freenet/src/freenet/pluginmanager/TestPlugin.java
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
   trunk/freenet/src/freenet/store/Block.java
   trunk/freenet/src/freenet/store/FreenetStore.java
   trunk/freenet/src/freenet/store/KeyCollisionException.java
   trunk/freenet/src/freenet/store/Store.java
   trunk/freenet/src/freenet/support/Base64.java
   trunk/freenet/src/freenet/support/BitArray.java
   trunk/freenet/src/freenet/support/Buffer.java
   trunk/freenet/src/freenet/support/CPUInformation/AMDCPUInfo.java
   trunk/freenet/src/freenet/support/CPUInformation/CPUID.java
   trunk/freenet/src/freenet/support/CPUInformation/CPUInfo.java
   trunk/freenet/src/freenet/support/CPUInformation/IntelCPUInfo.java
   trunk/freenet/src/freenet/support/CPUInformation/UnknownCPUException.java
   trunk/freenet/src/freenet/support/DoubleTokenBucket.java
   trunk/freenet/src/freenet/support/DoublyLinkedList.java
   trunk/freenet/src/freenet/support/DoublyLinkedListImpl.java
   trunk/freenet/src/freenet/support/Fields.java
   trunk/freenet/src/freenet/support/FileLoggerHook.java
   trunk/freenet/src/freenet/support/HTMLDecoder.java
   trunk/freenet/src/freenet/support/HTMLEncoder.java
   trunk/freenet/src/freenet/support/HTMLNode.java
   trunk/freenet/src/freenet/support/HexUtil.java
   trunk/freenet/src/freenet/support/IllegalBase64Exception.java
   trunk/freenet/src/freenet/support/ImmutableByteArrayWrapper.java
   trunk/freenet/src/freenet/support/IndexableUpdatableSortedLinkedListItem.java
   trunk/freenet/src/freenet/support/IntNumberedItem.java
   trunk/freenet/src/freenet/support/LRUHashtable.java
   trunk/freenet/src/freenet/support/LRUQueue.java
   trunk/freenet/src/freenet/support/LimitedEnumeration.java
   trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
   trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMapElement.java
   trunk/freenet/src/freenet/support/Loader.java
   trunk/freenet/src/freenet/support/Logger.java
   trunk/freenet/src/freenet/support/LoggerHook.java
   trunk/freenet/src/freenet/support/LoggerHookChain.java
   trunk/freenet/src/freenet/support/MultiValueTable.java
   trunk/freenet/src/freenet/support/NumberedItem.java
   trunk/freenet/src/freenet/support/NumberedItemComparator.java
   trunk/freenet/src/freenet/support/NumberedRecentItems.java
   trunk/freenet/src/freenet/support/OutputStreamLogger.java
   trunk/freenet/src/freenet/support/PromiscuousItemException.java
   trunk/freenet/src/freenet/support/RandomGrabArray.java
   trunk/freenet/src/freenet/support/RandomGrabArrayItem.java
   trunk/freenet/src/freenet/support/RandomGrabArrayWithClient.java
   trunk/freenet/src/freenet/support/RandomGrabArrayWithInt.java
   trunk/freenet/src/freenet/support/ReceivedPacketNumbers.java
   trunk/freenet/src/freenet/support/RemoveRandom.java
   trunk/freenet/src/freenet/support/RemoveRandomWithClient.java
   trunk/freenet/src/freenet/support/SectoredRandomGrabArray.java
   trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithClient.java
   trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithInt.java
   trunk/freenet/src/freenet/support/Serializer.java
   trunk/freenet/src/freenet/support/ShortBuffer.java
   trunk/freenet/src/freenet/support/SimpleFieldSet.java
   trunk/freenet/src/freenet/support/SimpleIntNumberedItemComparator.java
   trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java
   trunk/freenet/src/freenet/support/SizeUtil.java
   trunk/freenet/src/freenet/support/SortedLongSet.java
   trunk/freenet/src/freenet/support/SortedVectorByNumber.java
   trunk/freenet/src/freenet/support/TokenBucket.java
   trunk/freenet/src/freenet/support/URIPreEncoder.java
   trunk/freenet/src/freenet/support/URLDecoder.java
   trunk/freenet/src/freenet/support/URLEncodedFormatException.java
   trunk/freenet/src/freenet/support/URLEncoder.java
   trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java
   trunk/freenet/src/freenet/support/UpdatableSortedLinkedListItem.java
   trunk/freenet/src/freenet/support/UpdatableSortedLinkedListItemImpl.java
   
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListKilledException.java
   
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListWithForeignIndex.java
   trunk/freenet/src/freenet/support/VirginItemException.java
   trunk/freenet/src/freenet/support/VoidLogger.java
   trunk/freenet/src/freenet/support/WouldBlockException.java
   
trunk/freenet/src/freenet/support/compress/CompressionOutputSizeException.java
   trunk/freenet/src/freenet/support/compress/Compressor.java
   trunk/freenet/src/freenet/support/compress/DecompressException.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/Bucket.java
   trunk/freenet/src/freenet/support/io/BucketFactory.java
   trunk/freenet/src/freenet/support/io/BucketTools.java
   trunk/freenet/src/freenet/support/io/CannotCreateFromFieldSetException.java
   trunk/freenet/src/freenet/support/io/FileBucket.java
   trunk/freenet/src/freenet/support/io/FileBucketFactory.java
   trunk/freenet/src/freenet/support/io/FileUtil.java
   trunk/freenet/src/freenet/support/io/FilenameGenerator.java
   trunk/freenet/src/freenet/support/io/LineReader.java
   trunk/freenet/src/freenet/support/io/LineReadingInputStream.java
   trunk/freenet/src/freenet/support/io/NullBucket.java
   trunk/freenet/src/freenet/support/io/NullInputStream.java
   trunk/freenet/src/freenet/support/io/NullOutputStream.java
   trunk/freenet/src/freenet/support/io/NullPersistentFileTracker.java
   trunk/freenet/src/freenet/support/io/NullWriter.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/PersistentFileTracker.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/SpyInputStream.java
   trunk/freenet/src/freenet/support/io/SpyOutputStream.java
   trunk/freenet/src/freenet/support/io/TempBucketFactory.java
   trunk/freenet/src/freenet/support/io/TempBucketHook.java
   trunk/freenet/src/freenet/support/io/TempFileBucket.java
   trunk/freenet/src/freenet/support/io/TooLongException.java
   
trunk/freenet/src/freenet/support/math/BootstrappingDecayingRunningAverage.java
   trunk/freenet/src/freenet/support/math/RunningAverage.java
   trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
   trunk/freenet/src/freenet/support/math/SimpleRunningAverage.java
   trunk/freenet/src/freenet/support/math/TimeDecayingRunningAverage.java
   trunk/freenet/src/freenet/tools/AddRef.java
   trunk/freenet/src/freenet/transport/IPAddressDetector.java
   trunk/freenet/src/freenet/transport/IPUtil.java
   trunk/freenet/src/test/AddressIdentifierTest.java
   trunk/freenet/src/test/DatastoreTest.java
   trunk/freenet/src/test/Inet4AddressMatcherTest.java
   trunk/freenet/src/test/Inet6AddressMatcherTest.java
   trunk/freenet/src/test/PaddingSpeedTest.java
   trunk/freenet/src/test/PingTest.java
   trunk/freenet/src/test/PreNodeTest.java
   trunk/freenet/src/test/PreQuasiNodeTest.java
   trunk/freenet/src/test/QuasiNodeTest.java
   trunk/freenet/src/test/TransferBlockTest.java
   trunk/freenet/src/test/TransferSendTest.java
Log:
Revert 10483.
We cannot claim copyright on other people's work. (And "The Free Network 
Project" isn't a legal entity anyway; it's Freenet Project Inc if anything).
Further there are some issues to clarify re GPL version.

Modified: trunk/freenet/src/freenet/client/ArchiveContext.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveContext.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/ArchiveContext.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ArchiveContext.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.util.HashSet;

Modified: trunk/freenet/src/freenet/client/ArchiveFailureException.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveFailureException.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/ArchiveFailureException.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ArchiveFailureException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/ArchiveHandler.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveHandler.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/ArchiveHandler.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ArchiveHandler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.support.io.Bucket;

Modified: trunk/freenet/src/freenet/client/ArchiveKey.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveKey.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/client/ArchiveKey.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ArchiveKey.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ArchiveManager.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.io.File;

Modified: trunk/freenet/src/freenet/client/ArchiveRestartException.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveRestartException.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/ArchiveRestartException.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ArchiveRestartException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 /**

Modified: trunk/freenet/src/freenet/client/ArchiveStoreContext.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveStoreContext.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/ArchiveStoreContext.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ArchiveStoreContext.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/client/ArchiveStoreItem.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveStoreItem.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/ArchiveStoreItem.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ArchiveStoreItem.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.support.DoublyLinkedListImpl;

Modified: trunk/freenet/src/freenet/client/ClientMetadata.java
===================================================================
--- trunk/freenet/src/freenet/client/ClientMetadata.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/ClientMetadata.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientMetadata.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 /**

Modified: trunk/freenet/src/freenet/client/DefaultMIMETypes.java
===================================================================
--- trunk/freenet/src/freenet/client/DefaultMIMETypes.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/DefaultMIMETypes.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DefaultMIMETypes.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java
===================================================================
--- trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ErrorArchiveStoreItem.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/client/FECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/FECCodec.java      2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/client/FECCodec.java      2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FECCodec.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/FailureCodeTracker.java
===================================================================
--- trunk/freenet/src/freenet/client/FailureCodeTracker.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/FailureCodeTracker.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FailureCodeTracker.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.util.Collection;

Modified: trunk/freenet/src/freenet/client/FetchException.java
===================================================================
--- trunk/freenet/src/freenet/client/FetchException.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/FetchException.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FetchException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/client/FetchResult.java
===================================================================
--- trunk/freenet/src/freenet/client/FetchResult.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/client/FetchResult.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FetchResult.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/FetchWaiter.java
===================================================================
--- trunk/freenet/src/freenet/client/FetchWaiter.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/client/FetchWaiter.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FetchWaiter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.client.async.BaseClientPutter;

Modified: trunk/freenet/src/freenet/client/FetcherContext.java
===================================================================
--- trunk/freenet/src/freenet/client/FetcherContext.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/FetcherContext.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FetcherContext.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.client.async.HealingQueue;

Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClient.java
===================================================================
--- trunk/freenet/src/freenet/client/HighLevelSimpleClient.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/HighLevelSimpleClient.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  HighLevelSimpleClient.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  HighLevelSimpleClientImpl.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/InsertBlock.java
===================================================================
--- trunk/freenet/src/freenet/client/InsertBlock.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/client/InsertBlock.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  InsertBlock.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/client/InserterContext.java
===================================================================
--- trunk/freenet/src/freenet/client/InserterContext.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/InserterContext.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  InserterContext.java.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.client.async.USKManager;

Modified: trunk/freenet/src/freenet/client/InserterException.java
===================================================================
--- trunk/freenet/src/freenet/client/InserterException.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/InserterException.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  InserterException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/client/Metadata.java
===================================================================
--- trunk/freenet/src/freenet/client/Metadata.java      2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/client/Metadata.java      2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Metadata.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.io.ByteArrayInputStream;

Modified: trunk/freenet/src/freenet/client/MetadataParseException.java
===================================================================
--- trunk/freenet/src/freenet/client/MetadataParseException.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/MetadataParseException.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  MetadataParseException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/MetadataUnresolvedException.java
===================================================================
--- trunk/freenet/src/freenet/client/MetadataUnresolvedException.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/MetadataUnresolvedException.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  MetadataUnresolvedException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 public class MetadataUnresolvedException extends Exception {

Modified: trunk/freenet/src/freenet/client/PutWaiter.java
===================================================================
--- trunk/freenet/src/freenet/client/PutWaiter.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/client/PutWaiter.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PutWaiter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.client.async.BaseClientPutter;

Modified: trunk/freenet/src/freenet/client/RealArchiveStoreItem.java
===================================================================
--- trunk/freenet/src/freenet/client/RealArchiveStoreItem.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/RealArchiveStoreItem.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  RealArchiveStoreItem.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.io.File;

Modified: trunk/freenet/src/freenet/client/SplitFetchException.java
===================================================================
--- trunk/freenet/src/freenet/client/SplitFetchException.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/SplitFetchException.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SplitFetchException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 public class SplitFetchException extends FetchException {

Modified: trunk/freenet/src/freenet/client/SplitfileBlock.java
===================================================================
--- trunk/freenet/src/freenet/client/SplitfileBlock.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/SplitfileBlock.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SplitfileBlock.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.support.io.Bucket;

Modified: trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StandardOnionFECCodec.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import java.io.DataInputStream;

Modified: trunk/freenet/src/freenet/client/StartableSplitfileBlock.java
===================================================================
--- trunk/freenet/src/freenet/client/StartableSplitfileBlock.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/StartableSplitfileBlock.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StartableSplitfileBlock.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/client/TempStoreElement.java
===================================================================
--- trunk/freenet/src/freenet/client/TempStoreElement.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/TempStoreElement.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,6 @@
-/*
-  TempStoreElement.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+/**
+ * 
+ */
 package freenet.client;

 import java.io.File;

Modified: trunk/freenet/src/freenet/client/async/BaseClientGetter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BaseClientGetter.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/BaseClientGetter.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BaseClientGetter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 public abstract class BaseClientGetter extends ClientRequester implements

Modified: trunk/freenet/src/freenet/client/async/BaseClientPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BaseClientPutter.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/BaseClientPutter.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BaseClientPutter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 public abstract class BaseClientPutter extends ClientRequester {

Modified: trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BaseSingleFileFetcher.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.FetcherContext;

Modified: trunk/freenet/src/freenet/client/async/ClientCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientCallback.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/ClientCallback.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.FetchException;

Modified: trunk/freenet/src/freenet/client/async/ClientGetState.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientGetState.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/ClientGetState.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientGetState.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 /**

Modified: trunk/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientGetter.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/ClientGetter.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientGetter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/ClientPutState.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientPutState.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/ClientPutState.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientPutState.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.InserterException;

Modified: trunk/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientPutter.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/ClientPutter.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientPutter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.ClientMetadata;

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientRequestScheduler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/client/async/ClientRequester.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequester.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/ClientRequester.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientRequester.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/client/async/GetCompletionCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/GetCompletionCallback.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/GetCompletionCallback.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  GetCompletionCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.FetchException;

Modified: trunk/freenet/src/freenet/client/async/HealingQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/async/HealingQueue.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/HealingQueue.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  HealingQueue.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.support.io.Bucket;

Modified: trunk/freenet/src/freenet/client/async/ManifestElement.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ManifestElement.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/ManifestElement.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ManifestElement.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/client/async/MinimalSplitfileBlock.java
===================================================================
--- trunk/freenet/src/freenet/client/async/MinimalSplitfileBlock.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/MinimalSplitfileBlock.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  MinimalSplitfileBlock.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.SplitfileBlock;

Modified: trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  MultiPutCompletionCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.util.Vector;

Modified: trunk/freenet/src/freenet/client/async/PutCompletionCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/PutCompletionCallback.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/PutCompletionCallback.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PutCompletionCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.InserterException;

Modified: trunk/freenet/src/freenet/client/async/ResumeException.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ResumeException.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/ResumeException.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ResumeException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.support.io.CannotCreateFromFieldSetException;

Modified: trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SimpleHealingQueue.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SimpleManifestPutter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleBlockInserter.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/SingleBlockInserter.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SingleBlockInserter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SingleFileFetcher.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SingleFileInserter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcher.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcher.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SplitFileFetcher.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SplitFileFetcherSegment.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserter.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserter.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SplitFileInserter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SplitFileInserterSegment.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/USKCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKCallback.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKCallback.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.keys.USK;

Modified: trunk/freenet/src/freenet/client/async/USKChecker.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKChecker.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKChecker.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKChecker.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.FetcherContext;

Modified: trunk/freenet/src/freenet/client/async/USKCheckerCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKCheckerCallback.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKCheckerCallback.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKCheckerCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.keys.ClientSSKBlock;

Modified: trunk/freenet/src/freenet/client/async/USKFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKFetcher.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKFetcher.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKFetcher.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/USKFetcherCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKFetcherCallback.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKFetcherCallback.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKFetcherCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 /**

Modified: trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKFetcherWrapper.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.FetchException;

Modified: trunk/freenet/src/freenet/client/async/USKInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKInserter.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKInserter.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKInserter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/client/async/USKManager.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKManager.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKManager.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKManager.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/client/async/USKProxyCompletionCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKProxyCompletionCallback.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKProxyCompletionCallback.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKProxyCompletionCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.FetchException;

Modified: trunk/freenet/src/freenet/client/async/USKRetriever.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKRetriever.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKRetriever.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKRetriever.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/client/async/USKRetrieverCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKRetrieverCallback.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/async/USKRetrieverCallback.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  USKRetrieverCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.async;

 import freenet.client.FetchResult;

Modified: trunk/freenet/src/freenet/client/events/BlockInsertErrorEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/BlockInsertErrorEvent.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/BlockInsertErrorEvent.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BlockInsertErrorEvent.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 import freenet.client.InserterException;

Modified: trunk/freenet/src/freenet/client/events/ClientEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/ClientEvent.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/ClientEvent.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientEvent.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 /**

Modified: trunk/freenet/src/freenet/client/events/ClientEventListener.java
===================================================================
--- trunk/freenet/src/freenet/client/events/ClientEventListener.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/ClientEventListener.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientEventListener.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;



Modified: trunk/freenet/src/freenet/client/events/ClientEventProducer.java
===================================================================
--- trunk/freenet/src/freenet/client/events/ClientEventProducer.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/ClientEventProducer.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientEventProducer.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;



Modified: trunk/freenet/src/freenet/client/events/DecodedBlockEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/DecodedBlockEvent.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/DecodedBlockEvent.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DecodedBlockEvent.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 import freenet.keys.ClientKey;

Modified: trunk/freenet/src/freenet/client/events/EventDumper.java
===================================================================
--- trunk/freenet/src/freenet/client/events/EventDumper.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/EventDumper.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  EventDumper.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 import java.io.PrintWriter;

Modified: trunk/freenet/src/freenet/client/events/EventLogger.java
===================================================================
--- trunk/freenet/src/freenet/client/events/EventLogger.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/EventLogger.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  EventLogger.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 import freenet.support.Logger;

Modified: trunk/freenet/src/freenet/client/events/FetchedMetadataEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/FetchedMetadataEvent.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/FetchedMetadataEvent.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FetchedMetadataEvent.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;



Modified: trunk/freenet/src/freenet/client/events/FinishedCompressionEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/FinishedCompressionEvent.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/FinishedCompressionEvent.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FinishedCompressionEvent.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 public class FinishedCompressionEvent implements ClientEvent {

Modified: trunk/freenet/src/freenet/client/events/GeneratedURIEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/GeneratedURIEvent.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/GeneratedURIEvent.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  GeneratedURIEvent.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/client/events/GotBlockEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/GotBlockEvent.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/GotBlockEvent.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  GotBlockEvent.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 import freenet.keys.ClientKey;

Modified: trunk/freenet/src/freenet/client/events/SimpleBlockPutEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/SimpleBlockPutEvent.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/SimpleBlockPutEvent.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SimpleBlockPutEvent.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 import freenet.keys.ClientKey;

Modified: trunk/freenet/src/freenet/client/events/SimpleEventProducer.java
===================================================================
--- trunk/freenet/src/freenet/client/events/SimpleEventProducer.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/SimpleEventProducer.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SimpleElementProducer.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;
 import java.util.Enumeration;
 import java.util.NoSuchElementException;

Modified: trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java 
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java 
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SplitfileProgressEvent.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 import freenet.support.Logger;

Modified: trunk/freenet/src/freenet/client/events/StartedCompressionEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/StartedCompressionEvent.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/client/events/StartedCompressionEvent.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StartedCompressionEvent.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.client.events;

 /**

Modified: trunk/freenet/src/freenet/clients/http/Bookmark.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Bookmark.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/Bookmark.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Bookmark.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/clients/http/BookmarkManager.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/BookmarkManager.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/BookmarkManager.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BookmarkManager.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.util.Vector;

Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ConfigToadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DarknetConnection.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FProxyToadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.ByteArrayOutputStream;

Modified: trunk/freenet/src/freenet/clients/http/HTTPRequest.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/HTTPRequest.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/HTTPRequest.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,662 +1,643 @@
-/*
-  HTTPRequest.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-package freenet.clients.http;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import freenet.support.Logger;
-import freenet.support.MultiValueTable;
-import freenet.support.URLDecoder;
-import freenet.support.URLEncodedFormatException;
-import freenet.support.io.Bucket;
-import freenet.support.io.BucketFactory;
-import freenet.support.io.BucketTools;
-import freenet.support.io.LineReadingInputStream;
-
-/**
- * Used for passing all HTTP request information to the FredPlugin that handles
- * the request. It parses the query string and has several methods for acessing
- * the request parameter values.
- * 
- * @author nacktschneck
- */
-public class HTTPRequest {
-
-       /**
-        * This map is used to store all parameter values. The name (as String) 
of
-        * the parameter is used as key, the returned value is a list (of 
Strings)
-        * with all values for that parameter sent in the request. You shouldn't
-        * access this map directly, use {@link #getParameterValueList(String)} 
and
-        * {@link #isParameterSet(String)} insted
-        */
-       private final Map parameterNameValuesMap = new HashMap();
-
-       /**
-        * the original URI as given to the constructor
-        */
-       private URI uri;
-       
-       /**
-        * The headers sent by the client
-        */
-       private MultiValueTable headers;
-       
-       /**
-        * The data sent in the connection
-        */
-       private Bucket data;
-       
-       /**
-        * A hasmap of buckets that we use to store all the parts for a 
multipart/form-data request
-        */
-       private HashMap parts;
-       
-       /** A map for uploaded files. */
-       private Map uploadedFiles = new HashMap();
-       
-       private final BucketFactory bucketfactory;
-
-       /**
-        * Create a new HTTPRequest for the given URI and parse its request
-        * parameters.
-        * 
-        * @param uri
-        *            the URI being requested
-        */
-       public HTTPRequest(URI uri) {
-               this.uri = uri;
-               this.parseRequestParameters(uri.getRawQuery(), true);
-               this.data = null;
-               this.parts = null;
-               this.bucketfactory = null;
-       }
-
-       /**
-        * Creates a new HTTPRequest for the given path and url-encoded query 
string
-        * 
-        * @param path i.e. /test/test.html
-        * @param encodedQueryString a=some+text&b=abc%40def.de
-        * @throws URISyntaxException if the URI is invalid
-        */
-       public HTTPRequest(String path, String encodedQueryString) throws 
URISyntaxException {
-               this.data = null;
-               this.parts = null;
-               this.bucketfactory = null;
-               if ((encodedQueryString!=null) && 
(encodedQueryString.length()>0)) {
-                       this.uri = new URI(path+"?"+encodedQueryString);
-               } else {
-                       this.uri = new URI(path);
-               }
-               this.parseRequestParameters(uri.getRawQuery(), true);
-       }
-       
-       /**
-        * Creates a new HTTPRequest for the given URI and data.
-        * multipart/form-data will be split into Part's, but
-        * application/x-www-form-urlencoded will be split into Param's.
-        * 
-        * @param uri The URI being requested
-        * @param h Client headers
-        * @param d The data
-        * @param ctx The toadlet context (for headers and bucket factory)
-        * @throws URISyntaxException if the URI is invalid
-        */
-       public HTTPRequest(URI uri, Bucket d, ToadletContext ctx) {
-               this.uri = uri;
-               this.headers = ctx.getHeaders();
-               this.parseRequestParameters(uri.getRawQuery(), true);
-               this.data = d;
-               this.parts = new HashMap();
-               this.bucketfactory = ctx.getBucketFactory();
-               try {
-                       this.parseMultiPartData();
-               } catch (IOException ioe) {
-                       
-               }
-       }
-       
-
-       /**
-        * The path of this request, where the part of the path the specified 
the
-        * plugin has already been removed..
-        */
-       public String getPath() {
-               return this.uri.getPath();
-       }
-
-
-       /**
-        * 
-        * @return true if the query string was totally empty
-        */
-       public boolean hasParameters() {
-               return ! this.parameterNameValuesMap.isEmpty();
-       }
-
-       /**
-        * Parse the query string and populate {@link #parameterNameValuesMap} 
with
-        * the lists of values for each parameter. If this method is not called 
at
-        * all, all other methods would be useless. Because they rely on the
-        * parameter map to be filled.
-        * 
-        * @param queryString
-        *            the query string in its raw form (not yet url-decoded)
-        * @param doUrlDecoding TODO
-        */
-       private void parseRequestParameters(String queryString, boolean 
doUrlDecoding) {
-
-               boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
-               if(logMINOR) Logger.minor(this, "queryString is 
"+queryString+", doUrlDecoding="+doUrlDecoding);
-               
-               // nothing to do if there was no query string in the URI
-               if ((queryString == null) || (queryString.length() == 0)) {
-                       return;
-               }
-
-               // iterate over all tokens in the query string (seperated by &)
-               StringTokenizer tokenizer = new StringTokenizer(queryString, 
"&");
-               while (tokenizer.hasMoreTokens()) {
-                       String nameValueToken = tokenizer.nextToken();
-                       
-                       if(logMINOR) Logger.minor(this, "Token: 
"+nameValueToken);
-
-                       // a token can be either a name, or a name value pair...
-                       String name = null;
-                       String value = "";
-                       int indexOfEqualsChar = nameValueToken.indexOf('=');
-                       if (indexOfEqualsChar < 0) {
-                               // ...it's only a name, so the value stays 
emptys
-                               name = nameValueToken;
-                               if(logMINOR) Logger.minor(this, "Name: "+name);
-                       } else if (indexOfEqualsChar == nameValueToken.length() 
- 1) {
-                               // ...it's a name with an empty value, so 
remove the '='
-                               // character
-                               name = nameValueToken.substring(0, 
indexOfEqualsChar);
-                               if(logMINOR) Logger.minor(this, "Name: "+name);
-                       } else {
-                               // ...it's a name value pair, split into name 
and value
-                               name = nameValueToken.substring(0, 
indexOfEqualsChar);
-                               value = 
nameValueToken.substring(indexOfEqualsChar + 1);
-                               if(logMINOR) Logger.minor(this, "Name: "+name+" 
Value: "+value);
-                       }
-
-                       // url-decode the name and value
-                       try {
-                               if (doUrlDecoding) {
-                                       name = URLDecoder.decode(name);
-                                       value = URLDecoder.decode(value);
-                                       if(logMINOR) {
-                                               Logger.minor(this, "Decoded 
name: "+name);
-                                               Logger.minor(this, "Decoded 
value: "+value);
-                                       }
-                               }
-
-                               // get the list of values for this parameter 
that were parsed so
-                               // far
-                               List valueList = 
this.getParameterValueList(name);
-                               // add this value to the list
-                               valueList.add(value);
-                       } catch (URLEncodedFormatException e) {
-                               // if we fail to decode the name or value we 
fail spectacularly
-                               String msg = "Failed to decode request 
parameter " + name
-                                               + " with value '" + value + "'";
-                               throw new RuntimeException(msg, e);
-                       }
-               }
-       }
-
-       /**
-        * Get the first value of the parameter with the given name.
-        * 
-        * @param name
-        *            the name of the parameter to get
-        * @return the first value or <code>null</code> if the parameter was not
-        *         set
-        */
-       private String getParameterValue(String name) {
-               if (!this.isParameterSet(name)) {
-                       return null;
-               }
-               List allValues = this.getParameterValueList(name);
-               return (String) allValues.get(0);
-       }
-
-       /**
-        * Get the list of all values for the parameter with the given name. 
When
-        * this method is called for a given parameter for the first time, a new
-        * empty list of values is created and stored in
-        * {@link #parameterNameValuesMap}. This list is returned and should be
-        * used to add parameter values. If you only want to check if a 
parameter is
-        * set at all, you must use {@link #isParameterSet(String)}.
-        * 
-        * @param name
-        *            the name of the parameter to get
-        * @return the list of all values for this parameter that were parsed so
-        *         far.
-        */
-       private List getParameterValueList(String name) {
-               List values = (List) this.parameterNameValuesMap.get(name);
-               if (values == null) {
-                       values = new LinkedList();
-                       this.parameterNameValuesMap.put(name, values);
-               }
-               return values;
-       }
-
-       /**
-        * Check if a parameter was set in the request at all, either with or
-        * without a value.
-        * 
-        * @param name
-        *            the name of the parameter to check
-        * @return true if the parameter was set in the request, not regarding 
if
-        *         the value is empty
-        */
-       public boolean isParameterSet(String name) {
-               return this.parameterNameValuesMap.containsKey(name);
-       }
-
-       /**
-        * Get the value of a request parameter, using an empty string as 
default
-        * value if the parameter was not set. This method will never return 
null,
-        * so its safe to do things like
-        * 
-        * <p>
-        * <code>
-        *   if (request.getParam(&quot;abc&quot;).equals(&quot;def&quot;))
-        * </code>
-        * </p>
-        * 
-        * @param name
-        *            the name of the parameter to get
-        * @return the parameter value as String, or an empty String if the 
value
-        *         was missing or empty
-        */
-       public String getParam(String name) {
-               return this.getParam(name, "");
-       }
-
-       /**
-        * Get the value of a request parameter, using the specified default 
value
-        * if the parameter was not set or has an empty value.
-        * 
-        * @param name
-        *            the name of the parameter to get
-        * @param defaultValue
-        *            the default value to be returned if the parameter is 
missing
-        *            or empty
-        * @return either the parameter value as String, or the default value
-        */
-       public String getParam(String name, String defaultValue) {
-               String value = this.getParameterValue(name);
-               if (value == null) {
-                       return defaultValue;
-               }
-               return value;
-       }
-
-       /**
-        * Get the value of a request parameter converted to an int, using 0 as
-        * default value. If there are multiple values for this parameter, the 
first
-        * value is used.
-        * 
-        * @param name
-        *            the name of the parameter to get
-        * @return either the parameter value as int, or 0 if the parameter is
-        *         missing, empty or invalid
-        */
-       public int getIntParam(String name) {
-               return this.getIntParam(name, 0);
-       }
-
-       /**
-        * Get the value of a request parameter converted to an 
<code>int</code>,
-        * using the specified default value. If there are multiple values for 
this
-        * parameter, the first value is used.
-        * 
-        * @param name
-        *            the name of the parameter to get
-        * @param defaultValue
-        *            the default value to be returned if the parameter is 
missing,
-        *            empty or invalid
-        * @return either the parameter value as int, or the default value
-        */
-       public int getIntParam(String name, int defaultValue) {
-               if (!this.isParameterSet(name)) {
-                       return defaultValue;
-               }
-               String value = this.getParameterValue(name);
-               try {
-                       return Integer.parseInt(value);
-               } catch (NumberFormatException e) {
-                       return defaultValue;
-               }
-       }
-
-       // TODO: add similar methods for long, boolean etc.
-
-       /**
-        * Get all values of a request parameter as a string array. If the 
parameter
-        * was not set at all, an empty array is returned, so this method will 
never
-        * return <code>null</code>.
-        * 
-        * @param name
-        *            the name of the parameter to get
-        * @return an array of all paramter values that might include empty 
values
-        */
-       public String[] getMultipleParam(String name) {
-               List valueList = this.getParameterValueList(name);
-               String[] values = new String[valueList.size()];
-               valueList.toArray(values);
-               return values;
-       }
-
-       /**
-        * Get all values of a request parameter as int array, ignoring all 
values
-        * that can not be parsed. If the parameter was not set at all, an empty
-        * array is returned, so this method will never return 
<code>null</code>.
-        * 
-        * @param name
-        *            the name of the parameter to get
-        * @return an int array of all parameter values that could be parsed as 
int
-        */
-       public int[] getMultipleIntParam(String name) {
-               List valueList = this.getParameterValueList(name);
-
-               // try parsing all values and put the valid Integers in a new 
list
-               List intValueList = new ArrayList();
-               for (int i = 0; i < valueList.size(); i++) {
-                       try {
-                               intValueList.add(new Integer((String) 
valueList.get(i)));
-                       } catch (Exception e) {
-                               // ignore invalid parameter values
-                       }
-               }
-
-               // convert the valid Integers to an array of ints
-               int[] values = new int[intValueList.size()];
-               for (int i = 0; i < intValueList.size(); i++) {
-                       values[i] = ((Integer) intValueList.get(i)).intValue();
-               }
-               return values;
-       }
-
-
-       // TODO: add similar methods for multiple long, boolean etc.
-       
-       
-       /**
-        * Parse submitted data from a bucket.
-        * Note that if this is application/x-www-form-urlencoded, it will come 
out as
-        * params, whereas if it is multipart/form-data it will be separated 
into buckets.
-        */
-       private void parseMultiPartData() throws IOException {
-               String ctype = (String) this.headers.get("content-type");
-               if (ctype == null) return;
-               String[] ctypeparts = ctype.split(";");
-               
if(ctypeparts[0].equalsIgnoreCase("application/x-www-form-urlencoded")) {
-                       // Completely different encoding, but easy to handle
-                       if(data.size() > 1024*1024)
-                               throw new IOException("Too big");
-                       byte[] buf = BucketTools.toByteArray(data);
-                       String s = new String(buf, "us-ascii");
-                       parseRequestParameters(s, true);
-               }
-               if 
(!ctypeparts[0].trim().equalsIgnoreCase("multipart/form-data") || 
(ctypeparts.length < 2)) {
-                       return;
-               }
-               
-               String boundary = null;
-               for (int i = 0; i < ctypeparts.length; i++) {
-                       String[] subparts = ctypeparts[i].split("=");
-                       if ((subparts.length == 2) && 
subparts[0].trim().equalsIgnoreCase("boundary")) {
-                               boundary = subparts[1];
-                       }
-               }
-               
-               if ((boundary == null) || (boundary.length() == 0)) return;
-               if (boundary.charAt(0) == '"') boundary = boundary.substring(1);
-               if (boundary.charAt(boundary.length() - 1) == '"')
-                       boundary = boundary.substring(0, boundary.length() - 1);
-               
-               boundary = "--"+boundary;
-               
-               InputStream is = this.data.getInputStream();
-               LineReadingInputStream lis = new LineReadingInputStream(is);
-               
-               String line;
-               line = lis.readLine(100, 100, false); // really it's US-ASCII, 
but ISO-8859-1 is close enough.
-               while ((is.available() > 0) && !line.equals(boundary)) {
-                       line = lis.readLine(100, 100, false);
-               }
-               
-               boundary  = "\r\n"+boundary;
-               
-               Bucket filedata = null;
-               String name = null;
-               String filename = null;
-               String contentType = null;
-               
-               while(is.available() > 0) {
-                       name = null;
-                       filename = null;
-                       contentType = null;
-                       // chomp headers
-                       while( (line = lis.readLine(200, 200, false)) /* see 
above */ != null) {
-                               if (line.length() == 0) break;
-                               
-                               String[] lineparts = line.split(":");
-                               if (lineparts == null || lineparts.length == 0) 
continue;
-                               String hdrname = lineparts[0].trim();
-                               
-                               if 
(hdrname.equalsIgnoreCase("Content-Disposition")) {
-                                       if (lineparts.length < 2) continue;
-                                       String[] valueparts = 
lineparts[1].split(";");
-                                       
-                                       for (int i = 0; i < valueparts.length; 
i++) {
-                                               String[] subparts = 
valueparts[i].split("=");
-                                               if (subparts.length != 2) {
-                                                       continue;
-                                               }
-                                               String fieldname = 
subparts[0].trim();
-                                               String value = 
subparts[1].trim();
-                                               if (value.startsWith("\"") && 
value.endsWith("\"")) {
-                                                       value = 
value.substring(1, value.length() - 1);
-                                               }
-                                               if 
(fieldname.equalsIgnoreCase("name")) {
-                                                       name = value;
-                                               } else if 
(fieldname.equalsIgnoreCase("filename")) {
-                                                       filename = value;
-                                               }
-                                       }
-                               } else if 
(hdrname.equalsIgnoreCase("Content-Type")) {
-                                       contentType = lineparts[1].trim();
-                               } else {
-                                       
-                               }
-                       }
-                       
-                       if (name == null) continue;
-                       
-                       // we should be at the data now. Start reading it in, 
checking for the
-                       // boundary string
-                       
-                       // we can only give an upper bound for the size of the 
bucket
-                       filedata = 
this.bucketfactory.makeBucket(is.available());
-                       OutputStream bucketos = filedata.getOutputStream();
-                       // buffer characters that match the boundary so far
-                       byte[] buf = new byte[boundary.length()];
-                       byte[] bbound = boundary.getBytes("UTF-8");
-                       int offset = 0;
-                       while ((is.available() > 0) && (offset < buf.length)) {
-                               byte b = (byte)is.read();
-                               
-                               if (b == bbound[offset]) {
-                                       buf[offset] = b;
-                                       offset++;
-                               } else if ((b != bbound[offset]) && (offset > 
0)) {
-                                       // empty the buffer out
-                                       bucketos.write(buf, 0, offset);
-                                       bucketos.write((int) b & 0xff);
-                                       offset = 0;
-                               } else {
-                                       bucketos.write((int) b & 0xff);
-                               }
-                       }
-                       
-                       bucketos.close();
-                       
-                       this.parts.put(name, filedata);
-                       if (filename != null) {
-                               this.uploadedFiles.put(name, new File(filename, 
contentType, filedata));
-                       }
-               }
-       }
-       
-       public File getUploadedFile(String name) {
-               return (File) uploadedFiles.get(name);
-       }
-       
-       public Bucket getPart(String name) {
-               return (Bucket)this.parts.get(name);
-       }
-       
-       public boolean isPartSet(String name) {
-               return this.parts.containsKey(name);
-       }
-       
-       public String getPartAsString(String name, int maxlength) {
-               Bucket part = (Bucket)this.parts.get(name);
-               if(part == null) return "";
-               
-               if (part.size() > maxlength) return "";
-               
-               try {
-                       InputStream is = part.getInputStream();
-                       DataInputStream dis = new DataInputStream(is);
-                       byte[] buf = new byte[is.available()];
-                       dis.readFully(buf);
-                       is.close();
-                       return new String(buf);
-               } catch (IOException ioe) {
-                       
-               }
-               return "";
-       }
-       
-       public void freeParts() {
-               if (this.parts == null) return;
-               Iterator i = this.parts.keySet().iterator();
-               
-               while (i.hasNext()) {
-                       String key = (String) i.next();
-                       Bucket b = (Bucket)this.parts.get(key);
-                       b.free();
-               }
-       }
-
-       public long getLongParam(String name, long defaultValue) {
-               if (!this.isParameterSet(name)) {
-                       return defaultValue;
-               }
-               String value = this.getParameterValue(name);
-               try {
-                       return Long.parseLong(value);
-               } catch (NumberFormatException e) {
-                       return defaultValue;
-               }
-       }
-
-       /**
-        * Container for uploaded files in HTTP POST requests.
-        * 
-        * @author David 'Bombe' Roden &lt;bombe at freenetproject.org&gt;
-        * @version $Id$
-        */
-       public static class File {
-
-               /** The filename. */
-               private final String filename;
-
-               /** The content type. */
-               private final String contentType;
-
-               /** The data. */
-               private final Bucket data;
-
-               /**
-                * Creates a new file with the specified filename, content 
type, and
-                * data.
-                * 
-                * @param filename
-                *            The name of the file
-                * @param contentType
-                *            The content type of the file
-                * @param data
-                *            The data of the file
-                */
-               public File(String filename, String contentType, Bucket data) {
-                       this.filename = filename;
-                       this.contentType = contentType;
-                       this.data = data;
-               }
-
-               /**
-                * Returns the content type of the file.
-                * 
-                * @return The content type of the file
-                */
-               public String getContentType() {
-                       return contentType;
-               }
-
-               /**
-                * Returns the data of the file.
-                * 
-                * @return The data of the file
-                */
-               public Bucket getData() {
-                       return data;
-               }
-
-               /**
-                * Returns the name of the file.
-                * 
-                * @return The name of the file
-                */
-               public String getFilename() {
-                       return filename;
-               }
-
-       }
-
-}
+package freenet.clients.http;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import freenet.support.Logger;
+import freenet.support.MultiValueTable;
+import freenet.support.URLDecoder;
+import freenet.support.URLEncodedFormatException;
+import freenet.support.io.Bucket;
+import freenet.support.io.BucketFactory;
+import freenet.support.io.BucketTools;
+import freenet.support.io.LineReadingInputStream;
+
+/**
+ * Used for passing all HTTP request information to the FredPlugin that handles
+ * the request. It parses the query string and has several methods for acessing
+ * the request parameter values.
+ * 
+ * @author nacktschneck
+ */
+public class HTTPRequest {
+
+       /**
+        * This map is used to store all parameter values. The name (as String) 
of
+        * the parameter is used as key, the returned value is a list (of 
Strings)
+        * with all values for that parameter sent in the request. You shouldn't
+        * access this map directly, use {@link #getParameterValueList(String)} 
and
+        * {@link #isParameterSet(String)} insted
+        */
+       private final Map parameterNameValuesMap = new HashMap();
+
+       /**
+        * the original URI as given to the constructor
+        */
+       private URI uri;
+       
+       /**
+        * The headers sent by the client
+        */
+       private MultiValueTable headers;
+       
+       /**
+        * The data sent in the connection
+        */
+       private Bucket data;
+       
+       /**
+        * A hasmap of buckets that we use to store all the parts for a 
multipart/form-data request
+        */
+       private HashMap parts;
+       
+       /** A map for uploaded files. */
+       private Map uploadedFiles = new HashMap();
+       
+       private final BucketFactory bucketfactory;
+
+       /**
+        * Create a new HTTPRequest for the given URI and parse its request
+        * parameters.
+        * 
+        * @param uri
+        *            the URI being requested
+        */
+       public HTTPRequest(URI uri) {
+               this.uri = uri;
+               this.parseRequestParameters(uri.getRawQuery(), true);
+               this.data = null;
+               this.parts = null;
+               this.bucketfactory = null;
+       }
+
+       /**
+        * Creates a new HTTPRequest for the given path and url-encoded query 
string
+        * 
+        * @param path i.e. /test/test.html
+        * @param encodedQueryString a=some+text&b=abc%40def.de
+        * @throws URISyntaxException if the URI is invalid
+        */
+       public HTTPRequest(String path, String encodedQueryString) throws 
URISyntaxException {
+               this.data = null;
+               this.parts = null;
+               this.bucketfactory = null;
+               if ((encodedQueryString!=null) && 
(encodedQueryString.length()>0)) {
+                       this.uri = new URI(path+"?"+encodedQueryString);
+               } else {
+                       this.uri = new URI(path);
+               }
+               this.parseRequestParameters(uri.getRawQuery(), true);
+       }
+       
+       /**
+        * Creates a new HTTPRequest for the given URI and data.
+        * multipart/form-data will be split into Part's, but
+        * application/x-www-form-urlencoded will be split into Param's.
+        * 
+        * @param uri The URI being requested
+        * @param h Client headers
+        * @param d The data
+        * @param ctx The toadlet context (for headers and bucket factory)
+        * @throws URISyntaxException if the URI is invalid
+        */
+       public HTTPRequest(URI uri, Bucket d, ToadletContext ctx) {
+               this.uri = uri;
+               this.headers = ctx.getHeaders();
+               this.parseRequestParameters(uri.getRawQuery(), true);
+               this.data = d;
+               this.parts = new HashMap();
+               this.bucketfactory = ctx.getBucketFactory();
+               try {
+                       this.parseMultiPartData();
+               } catch (IOException ioe) {
+                       
+               }
+       }
+       
+
+       /**
+        * The path of this request, where the part of the path the specified 
the
+        * plugin has already been removed..
+        */
+       public String getPath() {
+               return this.uri.getPath();
+       }
+
+
+       /**
+        * 
+        * @return true if the query string was totally empty
+        */
+       public boolean hasParameters() {
+               return ! this.parameterNameValuesMap.isEmpty();
+       }
+
+       /**
+        * Parse the query string and populate {@link #parameterNameValuesMap} 
with
+        * the lists of values for each parameter. If this method is not called 
at
+        * all, all other methods would be useless. Because they rely on the
+        * parameter map to be filled.
+        * 
+        * @param queryString
+        *            the query string in its raw form (not yet url-decoded)
+        * @param doUrlDecoding TODO
+        */
+       private void parseRequestParameters(String queryString, boolean 
doUrlDecoding) {
+
+               boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
+               if(logMINOR) Logger.minor(this, "queryString is 
"+queryString+", doUrlDecoding="+doUrlDecoding);
+               
+               // nothing to do if there was no query string in the URI
+               if ((queryString == null) || (queryString.length() == 0)) {
+                       return;
+               }
+
+               // iterate over all tokens in the query string (seperated by &)
+               StringTokenizer tokenizer = new StringTokenizer(queryString, 
"&");
+               while (tokenizer.hasMoreTokens()) {
+                       String nameValueToken = tokenizer.nextToken();
+                       
+                       if(logMINOR) Logger.minor(this, "Token: 
"+nameValueToken);
+
+                       // a token can be either a name, or a name value pair...
+                       String name = null;
+                       String value = "";
+                       int indexOfEqualsChar = nameValueToken.indexOf('=');
+                       if (indexOfEqualsChar < 0) {
+                               // ...it's only a name, so the value stays 
emptys
+                               name = nameValueToken;
+                               if(logMINOR) Logger.minor(this, "Name: "+name);
+                       } else if (indexOfEqualsChar == nameValueToken.length() 
- 1) {
+                               // ...it's a name with an empty value, so 
remove the '='
+                               // character
+                               name = nameValueToken.substring(0, 
indexOfEqualsChar);
+                               if(logMINOR) Logger.minor(this, "Name: "+name);
+                       } else {
+                               // ...it's a name value pair, split into name 
and value
+                               name = nameValueToken.substring(0, 
indexOfEqualsChar);
+                               value = 
nameValueToken.substring(indexOfEqualsChar + 1);
+                               if(logMINOR) Logger.minor(this, "Name: "+name+" 
Value: "+value);
+                       }
+
+                       // url-decode the name and value
+                       try {
+                               if (doUrlDecoding) {
+                                       name = URLDecoder.decode(name);
+                                       value = URLDecoder.decode(value);
+                                       if(logMINOR) {
+                                               Logger.minor(this, "Decoded 
name: "+name);
+                                               Logger.minor(this, "Decoded 
value: "+value);
+                                       }
+                               }
+
+                               // get the list of values for this parameter 
that were parsed so
+                               // far
+                               List valueList = 
this.getParameterValueList(name);
+                               // add this value to the list
+                               valueList.add(value);
+                       } catch (URLEncodedFormatException e) {
+                               // if we fail to decode the name or value we 
fail spectacularly
+                               String msg = "Failed to decode request 
parameter " + name
+                                               + " with value '" + value + "'";
+                               throw new RuntimeException(msg, e);
+                       }
+               }
+       }
+
+       /**
+        * Get the first value of the parameter with the given name.
+        * 
+        * @param name
+        *            the name of the parameter to get
+        * @return the first value or <code>null</code> if the parameter was not
+        *         set
+        */
+       private String getParameterValue(String name) {
+               if (!this.isParameterSet(name)) {
+                       return null;
+               }
+               List allValues = this.getParameterValueList(name);
+               return (String) allValues.get(0);
+       }
+
+       /**
+        * Get the list of all values for the parameter with the given name. 
When
+        * this method is called for a given parameter for the first time, a new
+        * empty list of values is created and stored in
+        * {@link #parameterNameValuesMap}. This list is returned and should be
+        * used to add parameter values. If you only want to check if a 
parameter is
+        * set at all, you must use {@link #isParameterSet(String)}.
+        * 
+        * @param name
+        *            the name of the parameter to get
+        * @return the list of all values for this parameter that were parsed so
+        *         far.
+        */
+       private List getParameterValueList(String name) {
+               List values = (List) this.parameterNameValuesMap.get(name);
+               if (values == null) {
+                       values = new LinkedList();
+                       this.parameterNameValuesMap.put(name, values);
+               }
+               return values;
+       }
+
+       /**
+        * Check if a parameter was set in the request at all, either with or
+        * without a value.
+        * 
+        * @param name
+        *            the name of the parameter to check
+        * @return true if the parameter was set in the request, not regarding 
if
+        *         the value is empty
+        */
+       public boolean isParameterSet(String name) {
+               return this.parameterNameValuesMap.containsKey(name);
+       }
+
+       /**
+        * Get the value of a request parameter, using an empty string as 
default
+        * value if the parameter was not set. This method will never return 
null,
+        * so its safe to do things like
+        * 
+        * <p>
+        * <code>
+        *   if (request.getParam(&quot;abc&quot;).equals(&quot;def&quot;))
+        * </code>
+        * </p>
+        * 
+        * @param name
+        *            the name of the parameter to get
+        * @return the parameter value as String, or an empty String if the 
value
+        *         was missing or empty
+        */
+       public String getParam(String name) {
+               return this.getParam(name, "");
+       }
+
+       /**
+        * Get the value of a request parameter, using the specified default 
value
+        * if the parameter was not set or has an empty value.
+        * 
+        * @param name
+        *            the name of the parameter to get
+        * @param defaultValue
+        *            the default value to be returned if the parameter is 
missing
+        *            or empty
+        * @return either the parameter value as String, or the default value
+        */
+       public String getParam(String name, String defaultValue) {
+               String value = this.getParameterValue(name);
+               if (value == null) {
+                       return defaultValue;
+               }
+               return value;
+       }
+
+       /**
+        * Get the value of a request parameter converted to an int, using 0 as
+        * default value. If there are multiple values for this parameter, the 
first
+        * value is used.
+        * 
+        * @param name
+        *            the name of the parameter to get
+        * @return either the parameter value as int, or 0 if the parameter is
+        *         missing, empty or invalid
+        */
+       public int getIntParam(String name) {
+               return this.getIntParam(name, 0);
+       }
+
+       /**
+        * Get the value of a request parameter converted to an 
<code>int</code>,
+        * using the specified default value. If there are multiple values for 
this
+        * parameter, the first value is used.
+        * 
+        * @param name
+        *            the name of the parameter to get
+        * @param defaultValue
+        *            the default value to be returned if the parameter is 
missing,
+        *            empty or invalid
+        * @return either the parameter value as int, or the default value
+        */
+       public int getIntParam(String name, int defaultValue) {
+               if (!this.isParameterSet(name)) {
+                       return defaultValue;
+               }
+               String value = this.getParameterValue(name);
+               try {
+                       return Integer.parseInt(value);
+               } catch (NumberFormatException e) {
+                       return defaultValue;
+               }
+       }
+
+       // TODO: add similar methods for long, boolean etc.
+
+       /**
+        * Get all values of a request parameter as a string array. If the 
parameter
+        * was not set at all, an empty array is returned, so this method will 
never
+        * return <code>null</code>.
+        * 
+        * @param name
+        *            the name of the parameter to get
+        * @return an array of all paramter values that might include empty 
values
+        */
+       public String[] getMultipleParam(String name) {
+               List valueList = this.getParameterValueList(name);
+               String[] values = new String[valueList.size()];
+               valueList.toArray(values);
+               return values;
+       }
+
+       /**
+        * Get all values of a request parameter as int array, ignoring all 
values
+        * that can not be parsed. If the parameter was not set at all, an empty
+        * array is returned, so this method will never return 
<code>null</code>.
+        * 
+        * @param name
+        *            the name of the parameter to get
+        * @return an int array of all parameter values that could be parsed as 
int
+        */
+       public int[] getMultipleIntParam(String name) {
+               List valueList = this.getParameterValueList(name);
+
+               // try parsing all values and put the valid Integers in a new 
list
+               List intValueList = new ArrayList();
+               for (int i = 0; i < valueList.size(); i++) {
+                       try {
+                               intValueList.add(new Integer((String) 
valueList.get(i)));
+                       } catch (Exception e) {
+                               // ignore invalid parameter values
+                       }
+               }
+
+               // convert the valid Integers to an array of ints
+               int[] values = new int[intValueList.size()];
+               for (int i = 0; i < intValueList.size(); i++) {
+                       values[i] = ((Integer) intValueList.get(i)).intValue();
+               }
+               return values;
+       }
+
+
+       // TODO: add similar methods for multiple long, boolean etc.
+       
+       
+       /**
+        * Parse submitted data from a bucket.
+        * Note that if this is application/x-www-form-urlencoded, it will come 
out as
+        * params, whereas if it is multipart/form-data it will be separated 
into buckets.
+        */
+       private void parseMultiPartData() throws IOException {
+               String ctype = (String) this.headers.get("content-type");
+               if (ctype == null) return;
+               String[] ctypeparts = ctype.split(";");
+               
if(ctypeparts[0].equalsIgnoreCase("application/x-www-form-urlencoded")) {
+                       // Completely different encoding, but easy to handle
+                       if(data.size() > 1024*1024)
+                               throw new IOException("Too big");
+                       byte[] buf = BucketTools.toByteArray(data);
+                       String s = new String(buf, "us-ascii");
+                       parseRequestParameters(s, true);
+               }
+               if 
(!ctypeparts[0].trim().equalsIgnoreCase("multipart/form-data") || 
(ctypeparts.length < 2)) {
+                       return;
+               }
+               
+               String boundary = null;
+               for (int i = 0; i < ctypeparts.length; i++) {
+                       String[] subparts = ctypeparts[i].split("=");
+                       if ((subparts.length == 2) && 
subparts[0].trim().equalsIgnoreCase("boundary")) {
+                               boundary = subparts[1];
+                       }
+               }
+               
+               if ((boundary == null) || (boundary.length() == 0)) return;
+               if (boundary.charAt(0) == '"') boundary = boundary.substring(1);
+               if (boundary.charAt(boundary.length() - 1) == '"')
+                       boundary = boundary.substring(0, boundary.length() - 1);
+               
+               boundary = "--"+boundary;
+               
+               InputStream is = this.data.getInputStream();
+               LineReadingInputStream lis = new LineReadingInputStream(is);
+               
+               String line;
+               line = lis.readLine(100, 100, false); // really it's US-ASCII, 
but ISO-8859-1 is close enough.
+               while ((is.available() > 0) && !line.equals(boundary)) {
+                       line = lis.readLine(100, 100, false);
+               }
+               
+               boundary  = "\r\n"+boundary;
+               
+               Bucket filedata = null;
+               String name = null;
+               String filename = null;
+               String contentType = null;
+               
+               while(is.available() > 0) {
+                       name = null;
+                       filename = null;
+                       contentType = null;
+                       // chomp headers
+                       while( (line = lis.readLine(200, 200, false)) /* see 
above */ != null) {
+                               if (line.length() == 0) break;
+                               
+                               String[] lineparts = line.split(":");
+                               if (lineparts == null || lineparts.length == 0) 
continue;
+                               String hdrname = lineparts[0].trim();
+                               
+                               if 
(hdrname.equalsIgnoreCase("Content-Disposition")) {
+                                       if (lineparts.length < 2) continue;
+                                       String[] valueparts = 
lineparts[1].split(";");
+                                       
+                                       for (int i = 0; i < valueparts.length; 
i++) {
+                                               String[] subparts = 
valueparts[i].split("=");
+                                               if (subparts.length != 2) {
+                                                       continue;
+                                               }
+                                               String fieldname = 
subparts[0].trim();
+                                               String value = 
subparts[1].trim();
+                                               if (value.startsWith("\"") && 
value.endsWith("\"")) {
+                                                       value = 
value.substring(1, value.length() - 1);
+                                               }
+                                               if 
(fieldname.equalsIgnoreCase("name")) {
+                                                       name = value;
+                                               } else if 
(fieldname.equalsIgnoreCase("filename")) {
+                                                       filename = value;
+                                               }
+                                       }
+                               } else if 
(hdrname.equalsIgnoreCase("Content-Type")) {
+                                       contentType = lineparts[1].trim();
+                               } else {
+                                       
+                               }
+                       }
+                       
+                       if (name == null) continue;
+                       
+                       // we should be at the data now. Start reading it in, 
checking for the
+                       // boundary string
+                       
+                       // we can only give an upper bound for the size of the 
bucket
+                       filedata = 
this.bucketfactory.makeBucket(is.available());
+                       OutputStream bucketos = filedata.getOutputStream();
+                       // buffer characters that match the boundary so far
+                       byte[] buf = new byte[boundary.length()];
+                       byte[] bbound = boundary.getBytes("UTF-8");
+                       int offset = 0;
+                       while ((is.available() > 0) && (offset < buf.length)) {
+                               byte b = (byte)is.read();
+                               
+                               if (b == bbound[offset]) {
+                                       buf[offset] = b;
+                                       offset++;
+                               } else if ((b != bbound[offset]) && (offset > 
0)) {
+                                       // empty the buffer out
+                                       bucketos.write(buf, 0, offset);
+                                       bucketos.write((int) b & 0xff);
+                                       offset = 0;
+                               } else {
+                                       bucketos.write((int) b & 0xff);
+                               }
+                       }
+                       
+                       bucketos.close();
+                       
+                       this.parts.put(name, filedata);
+                       if (filename != null) {
+                               this.uploadedFiles.put(name, new File(filename, 
contentType, filedata));
+                       }
+               }
+       }
+       
+       public File getUploadedFile(String name) {
+               return (File) uploadedFiles.get(name);
+       }
+       
+       public Bucket getPart(String name) {
+               return (Bucket)this.parts.get(name);
+       }
+       
+       public boolean isPartSet(String name) {
+               return this.parts.containsKey(name);
+       }
+       
+       public String getPartAsString(String name, int maxlength) {
+               Bucket part = (Bucket)this.parts.get(name);
+               if(part == null) return "";
+               
+               if (part.size() > maxlength) return "";
+               
+               try {
+                       InputStream is = part.getInputStream();
+                       DataInputStream dis = new DataInputStream(is);
+                       byte[] buf = new byte[is.available()];
+                       dis.readFully(buf);
+                       is.close();
+                       return new String(buf);
+               } catch (IOException ioe) {
+                       
+               }
+               return "";
+       }
+       
+       public void freeParts() {
+               if (this.parts == null) return;
+               Iterator i = this.parts.keySet().iterator();
+               
+               while (i.hasNext()) {
+                       String key = (String) i.next();
+                       Bucket b = (Bucket)this.parts.get(key);
+                       b.free();
+               }
+       }
+
+       public long getLongParam(String name, long defaultValue) {
+               if (!this.isParameterSet(name)) {
+                       return defaultValue;
+               }
+               String value = this.getParameterValue(name);
+               try {
+                       return Long.parseLong(value);
+               } catch (NumberFormatException e) {
+                       return defaultValue;
+               }
+       }
+
+       /**
+        * Container for uploaded files in HTTP POST requests.
+        * 
+        * @author David 'Bombe' Roden &lt;bombe at freenetproject.org&gt;
+        * @version $Id$
+        */
+       public static class File {
+
+               /** The filename. */
+               private final String filename;
+
+               /** The content type. */
+               private final String contentType;
+
+               /** The data. */
+               private final Bucket data;
+
+               /**
+                * Creates a new file with the specified filename, content 
type, and
+                * data.
+                * 
+                * @param filename
+                *            The name of the file
+                * @param contentType
+                *            The content type of the file
+                * @param data
+                *            The data of the file
+                */
+               public File(String filename, String contentType, Bucket data) {
+                       this.filename = filename;
+                       this.contentType = contentType;
+                       this.data = data;
+               }
+
+               /**
+                * Returns the content type of the file.
+                * 
+                * @return The content type of the file
+                */
+               public String getContentType() {
+                       return contentType;
+               }
+
+               /**
+                * Returns the data of the file.
+                * 
+                * @return The data of the file
+                */
+               public Bucket getData() {
+                       return data;
+               }
+
+               /**
+                * Returns the name of the file.
+                * 
+                * @return The name of the file
+                */
+               public String getFilename() {
+                       return filename;
+               }
+
+       }
+
+}

Modified: trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  LocalFileInsertToadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.File;

Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  N2NTMToadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/NinjaSpider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/NinjaSpider.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/NinjaSpider.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  NinjaSpider.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.File;

Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PageMaker.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.File;

Modified: trunk/freenet/src/freenet/clients/http/PluginToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PluginToadlet.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/PluginToadlet.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,6 @@
-/*
-  PluginToadlet.java / Freenet
-  Copyright (C) David 'Bombe' Roden'
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+/**
+ * 
+ */
 package freenet.clients.http;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PproxyToadlet.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/PproxyToadlet.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PproxyToadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  QueueToadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.File;

Modified: trunk/freenet/src/freenet/clients/http/RedirectException.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/RedirectException.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/RedirectException.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  RedirectException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.net.URI;

Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SimpleToadletServer.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.File;

Modified: trunk/freenet/src/freenet/clients/http/Spider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Spider.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/clients/http/Spider.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Spider.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.BufferedWriter;

Modified: trunk/freenet/src/freenet/clients/http/StaticToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StaticToadlet.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/StaticToadlet.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StaticToadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SymlinkerToadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/Toadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Toadlet.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/clients/http/Toadlet.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Toadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/ToadletContainer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContainer.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/ToadletContainer.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ToadletContainer.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.net.URI;

Modified: trunk/freenet/src/freenet/clients/http/ToadletContext.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContext.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/ToadletContext.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ToadletContext.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.IOException;

Modified: 
trunk/freenet/src/freenet/clients/http/ToadletContextClosedException.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContextClosedException.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/ToadletContextClosedException.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ToadletContextClosedException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 public class ToadletContextClosedException extends Exception {

Modified: trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ToadletContextImpl.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/TrivialToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/TrivialToadlet.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/TrivialToadlet.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  TrivialToadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,6 +1,6 @@
 /*
   WelcomeToadlet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
+  Copyright (C)  The Free Network project
   Public Domain 2006  VolodyA! V A <volodya at whengendarmesleeps.org>

   This program is free software; you can redistribute it and/or

Modified: trunk/freenet/src/freenet/clients/http/filter/CSSParser.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSParser.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSParser.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  CSSParser.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import java.io.Reader;

Modified: trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  CSSReadFilter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,26 +1,8 @@
-/*
-  CSSTokenizerFilter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  
-  The following code was generated by JFlex 1.3.5 on 03/09/06 00:24
+/* The following code was generated by JFlex 1.3.5 on 03/09/06 00:24 */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;
 import java.io.*;
+import java.util.*;
 /* This class tokenizes a CSS2 Reader stream, writes it out to the output 
Writer, and filters any URLs found */
 // WARNING: this is not as thorough as the HTML parser - new versions of the 
standard could lead to anonymity risks. See comments in SaferFilter.java
 // Mostly from http://www.w3.org/TR/REC-CSS2/grammar.html

Modified: trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  CSSTokenizerFilter.jflex / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;
 import java.io.*;
 import java.util.*;

Modified: trunk/freenet/src/freenet/clients/http/filter/CharsetExtractor.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CharsetExtractor.java 
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/CharsetExtractor.java 
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  CharsetExtractor.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/filter/ContentDataFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/ContentDataFilter.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/ContentDataFilter.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ContentDataFilter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ContentFilter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import java.io.EOFException;

Modified: trunk/freenet/src/freenet/clients/http/filter/DataFilterException.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/DataFilterException.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/DataFilterException.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DataFilterException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import freenet.support.HTMLNode;

Modified: trunk/freenet/src/freenet/clients/http/filter/FilterCallback.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/FilterCallback.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/FilterCallback.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FilterCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 /**

Modified: trunk/freenet/src/freenet/clients/http/filter/FoundURICallback.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/FoundURICallback.java 
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/FoundURICallback.java 
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FoundURICallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import java.net.URI;

Modified: 
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
===================================================================
--- 
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java    
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java    
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  GenericReadFilterCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  HTMLFilter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 /* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */

 package freenet.clients.http.filter;

Modified: 
trunk/freenet/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java
===================================================================
--- 
trunk/freenet/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java
  2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java
  2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  KnownUnsafeContentTypeException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import freenet.support.HTMLNode;

Modified: trunk/freenet/src/freenet/clients/http/filter/MIMEType.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/MIMEType.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/MIMEType.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  MIMEType.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 /**

Modified: trunk/freenet/src/freenet/clients/http/filter/NullFilterCallback.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/NullFilterCallback.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/NullFilterCallback.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  NullFilterCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;



Modified: 
trunk/freenet/src/freenet/clients/http/filter/UnknownContentTypeException.java
===================================================================
--- 
trunk/freenet/src/freenet/clients/http/filter/UnknownContentTypeException.java  
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/clients/http/filter/UnknownContentTypeException.java  
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  UnknownContentTypeException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import freenet.support.HTMLEncoder;

Modified: 
trunk/freenet/src/freenet/clients/http/filter/UnsafeContentTypeException.java
===================================================================
--- 
trunk/freenet/src/freenet/clients/http/filter/UnsafeContentTypeException.java   
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/clients/http/filter/UnsafeContentTypeException.java   
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  UnsafeContentTypeException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/clients/http/filter/Yytoken.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/Yytoken.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/clients/http/filter/Yytoken.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Yytoken.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.clients.http.filter;

 /**

Modified: trunk/freenet/src/freenet/config/BooleanCallback.java
===================================================================
--- trunk/freenet/src/freenet/config/BooleanCallback.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/config/BooleanCallback.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BooleanCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 /**

Modified: trunk/freenet/src/freenet/config/BooleanOption.java
===================================================================
--- trunk/freenet/src/freenet/config/BooleanOption.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/BooleanOption.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BooleanOption.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 public class BooleanOption extends Option {

Modified: trunk/freenet/src/freenet/config/Config.java
===================================================================
--- trunk/freenet/src/freenet/config/Config.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/Config.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Config.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/config/FilePersistentConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/FilePersistentConfig.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/config/FilePersistentConfig.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FilePersistentConfig.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 import java.io.BufferedInputStream;

Modified: trunk/freenet/src/freenet/config/IntCallback.java
===================================================================
--- trunk/freenet/src/freenet/config/IntCallback.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/IntCallback.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  IntCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 /**

Modified: trunk/freenet/src/freenet/config/IntOption.java
===================================================================
--- trunk/freenet/src/freenet/config/IntOption.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/IntOption.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  IntOption.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 import freenet.support.Fields;

Modified: trunk/freenet/src/freenet/config/InvalidConfigValueException.java
===================================================================
--- trunk/freenet/src/freenet/config/InvalidConfigValueException.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/config/InvalidConfigValueException.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  InvalidConfigValueException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 /**

Modified: trunk/freenet/src/freenet/config/LongCallback.java
===================================================================
--- trunk/freenet/src/freenet/config/LongCallback.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/LongCallback.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  LongCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 /**

Modified: trunk/freenet/src/freenet/config/LongOption.java
===================================================================
--- trunk/freenet/src/freenet/config/LongOption.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/LongOption.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  LongOption.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 import freenet.support.Fields;

Modified: trunk/freenet/src/freenet/config/Option.java
===================================================================
--- trunk/freenet/src/freenet/config/Option.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/Option.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Option.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 /**

Modified: trunk/freenet/src/freenet/config/OptionFormatException.java
===================================================================
--- trunk/freenet/src/freenet/config/OptionFormatException.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/config/OptionFormatException.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  OptionFormatException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 /**

Modified: trunk/freenet/src/freenet/config/ShortCallback.java
===================================================================
--- trunk/freenet/src/freenet/config/ShortCallback.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/ShortCallback.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ShortCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 /**

Modified: trunk/freenet/src/freenet/config/ShortOption.java
===================================================================
--- trunk/freenet/src/freenet/config/ShortOption.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/ShortOption.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ShortOption.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 import freenet.support.Fields;

Modified: trunk/freenet/src/freenet/config/StringArrCallback.java
===================================================================
--- trunk/freenet/src/freenet/config/StringArrCallback.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/config/StringArrCallback.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StringArrCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 /** Callback (getter/setter) for a string config variable */

Modified: trunk/freenet/src/freenet/config/StringArrOption.java
===================================================================
--- trunk/freenet/src/freenet/config/StringArrOption.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/config/StringArrOption.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StringArrOption.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 import freenet.support.URLDecoder;

Modified: trunk/freenet/src/freenet/config/StringCallback.java
===================================================================
--- trunk/freenet/src/freenet/config/StringCallback.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/config/StringCallback.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StringCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 /** Callback (getter/setter) for a string config variable */

Modified: trunk/freenet/src/freenet/config/StringOption.java
===================================================================
--- trunk/freenet/src/freenet/config/StringOption.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/StringOption.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StringOption.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 public class StringOption extends Option {

Modified: trunk/freenet/src/freenet/config/SubConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/SubConfig.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/config/SubConfig.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SubConfig.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.config;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/crypt/BlockCipher.java
===================================================================
--- trunk/freenet/src/freenet/crypt/BlockCipher.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/BlockCipher.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,26 +1,11 @@
-/*
-  BlockCipher.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
+package freenet.crypt;

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/*
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
 */

-package freenet.crypt;
-
-
 /**
  * Defines the interface that must be implemented by symmetric block ciphers
  * used in the Freenet cryptography architecture

Modified: trunk/freenet/src/freenet/crypt/CipherInputStream.java
===================================================================
--- trunk/freenet/src/freenet/crypt/CipherInputStream.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/CipherInputStream.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,25 +1,10 @@
+package freenet.crypt;
 /*
-  CipherInputStream.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
 */

-package freenet.crypt;
-
 import java.io.*;

 /**

Modified: trunk/freenet/src/freenet/crypt/CipherModes.java
===================================================================
--- trunk/freenet/src/freenet/crypt/CipherModes.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/CipherModes.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  CipherModes.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 public interface CipherModes {

Modified: trunk/freenet/src/freenet/crypt/CipherOutputStream.java
===================================================================
--- trunk/freenet/src/freenet/crypt/CipherOutputStream.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/CipherOutputStream.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,25 +1,9 @@
+package freenet.crypt;
 /*
-  CipherOutputStream.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
 */
-
-package freenet.crypt;
-
 import java.io.*;

 /**

Modified: trunk/freenet/src/freenet/crypt/CryptoElement.java
===================================================================
--- trunk/freenet/src/freenet/crypt/CryptoElement.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/CryptoElement.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  CryptoElement.java / Freenet
-  Copyright (C) Oscar
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 /**

Modified: trunk/freenet/src/freenet/crypt/CryptoKey.java
===================================================================
--- trunk/freenet/src/freenet/crypt/CryptoKey.java      2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/CryptoKey.java      2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  CryptoKey.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.DataInputStream;

Modified: trunk/freenet/src/freenet/crypt/DHGroup.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DHGroup.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/DHGroup.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DHGroup.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.DataInputStream;

Modified: trunk/freenet/src/freenet/crypt/DSA.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSA.java    2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/crypt/DSA.java    2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,22 +1,3 @@
-/*
-  DSA.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.math.BigInteger;

Modified: trunk/freenet/src/freenet/crypt/DSAGroup.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAGroup.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/DSAGroup.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DSAGroup.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/crypt/DSAGroupGenerator.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAGroupGenerator.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/DSAGroupGenerator.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DSAGroupGenerator.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.math.BigInteger;

Modified: trunk/freenet/src/freenet/crypt/DSAPrivateKey.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAPrivateKey.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/DSAPrivateKey.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DSAPrivateKey.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.math.BigInteger;

Modified: trunk/freenet/src/freenet/crypt/DSAPublicKey.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAPublicKey.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/DSAPublicKey.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,4 @@
-/*
-  DSAPublicKey.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
 package freenet.crypt;

 import java.math.BigInteger;

Modified: trunk/freenet/src/freenet/crypt/DSASignature.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSASignature.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/DSASignature.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DSASignature.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/crypt/DecipherOutputStream.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DecipherOutputStream.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/DecipherOutputStream.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DecipherOutputStream.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.*;

Modified: trunk/freenet/src/freenet/crypt/DecryptionFailedException.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DecryptionFailedException.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/DecryptionFailedException.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DecryptionFailedException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 public class DecryptionFailedException extends Exception {

Modified: trunk/freenet/src/freenet/crypt/DiffieHellman.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DiffieHellman.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/DiffieHellman.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,9 @@
 /*
-  DiffieHellman.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
+ * This code is part of the Java Adaptive Network Client by Ian Clarke. It is
+ * distributed under the GNU Public Licence (GPL) version 2. See
+ * http://www.gnu.org/ for further details of the GPL.
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.util.Random;

Modified: trunk/freenet/src/freenet/crypt/DiffieHellmanContext.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DiffieHellmanContext.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/DiffieHellmanContext.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DiffieHellmanContext.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.security.MessageDigest;

Modified: trunk/freenet/src/freenet/crypt/Digest.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Digest.java 2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/crypt/Digest.java 2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,25 +1,10 @@
+package freenet.crypt;
 /*
-  Digest.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
 */

-package freenet.crypt;
-
 public interface Digest {

     /**

Modified: trunk/freenet/src/freenet/crypt/DigestFactory.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DigestFactory.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/DigestFactory.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,25 +1,10 @@
+package freenet.crypt;
 /*
-  DigestFactory.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
 */

-package freenet.crypt;
-
 /*
  * @deprecated Digests should be able to reinitialize themselves instead
  * Re-precated since I need to create many digests at the same time for the 

Modified: trunk/freenet/src/freenet/crypt/DigestInputStream.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DigestInputStream.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/DigestInputStream.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DigestInputStream.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.*;

Modified: trunk/freenet/src/freenet/crypt/DigestOutputStream.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DigestOutputStream.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/DigestOutputStream.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DigestOutputStream.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.*;

Modified: trunk/freenet/src/freenet/crypt/DummyRandomSource.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DummyRandomSource.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/DummyRandomSource.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  DummyRandomSource.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 /**

Modified: trunk/freenet/src/freenet/crypt/EncipherInputStream.java
===================================================================
--- trunk/freenet/src/freenet/crypt/EncipherInputStream.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/EncipherInputStream.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,25 +1,10 @@
+package freenet.crypt;
 /*
-  EncipherInputStream.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
 */

-package freenet.crypt;
-
 import java.io.*;

 /**

Modified: trunk/freenet/src/freenet/crypt/EntropySource.java
===================================================================
--- trunk/freenet/src/freenet/crypt/EntropySource.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/EntropySource.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,25 +1,11 @@
-/*
-  EntropySource.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
+package freenet.crypt;

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/*
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
 */

-package freenet.crypt;
-
 /**
  * A token used as an argument to a RandomSource's acceptTimerEntropy.
  * One such token must exist for each timed source.

Modified: trunk/freenet/src/freenet/crypt/Global.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Global.java 2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/crypt/Global.java 2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,22 +1,3 @@
-/*
-  Global.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import net.i2p.util.NativeBigInteger;

Modified: trunk/freenet/src/freenet/crypt/HMAC.java
===================================================================
--- trunk/freenet/src/freenet/crypt/HMAC.java   2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/crypt/HMAC.java   2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,22 +1,3 @@
-/*
-  HMAC.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.util.Arrays;

Modified: trunk/freenet/src/freenet/crypt/JavaSHA1.java
===================================================================
--- trunk/freenet/src/freenet/crypt/JavaSHA1.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/JavaSHA1.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,26 +1,11 @@
-/*
-  JavaSHA1.java / Freenet
-  Copyright (C) 2003 Matthew Toseland
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;
 import java.security.*;
 /*
+  Copyright 2003 Matthew Toseland
+  Subject to Gnu General Public License version 2
+  Part of Freenet, http://freenetproject.org/
+*/
+/*
   Implements an SHA-1 digest using javax.crypto
 */


Modified: trunk/freenet/src/freenet/crypt/KEProtocol.java
===================================================================
--- trunk/freenet/src/freenet/crypt/KEProtocol.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/KEProtocol.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,29 +1,15 @@
-/*
-  KEProtocol.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

+/*
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
+*/
+
 /**
  * Defines the interface that must be implemented by key-exchange protocols
  * such as RSA and Diffie-Helman

Modified: trunk/freenet/src/freenet/crypt/KeyAgreementSchemeContext.java
===================================================================
--- trunk/freenet/src/freenet/crypt/KeyAgreementSchemeContext.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/KeyAgreementSchemeContext.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  KeyAgreementSchemeContext.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import freenet.crypt.ciphers.Rijndael;

Modified: trunk/freenet/src/freenet/crypt/PCFBMode.java
===================================================================
--- trunk/freenet/src/freenet/crypt/PCFBMode.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/PCFBMode.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,26 +1,6 @@
-/*
-  PCFBMode.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;
-
 /*
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
   It is distributed under the GNU Public Licence (GPL) version 2.  See
   http://www.gnu.org/ for further details of the GPL.
 */

Modified: trunk/freenet/src/freenet/crypt/RandomSource.java
===================================================================
--- trunk/freenet/src/freenet/crypt/RandomSource.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/RandomSource.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,27 +1,13 @@
-/*
-  RandomSource.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.util.Random;

+/*
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
+*/
+
 /**
  * Interface for any random-number source in Freenet
  *

Modified: trunk/freenet/src/freenet/crypt/SHA1Factory.java
===================================================================
--- trunk/freenet/src/freenet/crypt/SHA1Factory.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/crypt/SHA1Factory.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SHA1Factory.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 public class SHA1Factory implements DigestFactory {

Modified: trunk/freenet/src/freenet/crypt/StationToStationContext.java
===================================================================
--- trunk/freenet/src/freenet/crypt/StationToStationContext.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/StationToStationContext.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StationToStation.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.ByteArrayInputStream;

Modified: trunk/freenet/src/freenet/crypt/UnsupportedCipherException.java
===================================================================
--- trunk/freenet/src/freenet/crypt/UnsupportedCipherException.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/UnsupportedCipherException.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  UnsupportedCipherException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 public class UnsupportedCipherException extends Exception {

Modified: trunk/freenet/src/freenet/crypt/UnsupportedDigestException.java
===================================================================
--- trunk/freenet/src/freenet/crypt/UnsupportedDigestException.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/UnsupportedDigestException.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  UnsupportedDigestException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 public class UnsupportedDigestException extends Exception {

Modified: trunk/freenet/src/freenet/crypt/Util.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Util.java   2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/crypt/Util.java   2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,23 +1,3 @@
-/*
-  Util.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.EOFException;
@@ -34,6 +14,12 @@
 import freenet.support.Loader;
 import net.i2p.util.NativeBigInteger;

+
+/*
+ * This code is part of the Java Adaptive Network Client by Ian Clarke. It is
+ * distributed under the GNU Public Licence (GPL) version 2. See
+ * http://www.gnu.org/ for further details of the GPL.
+ */
 public class Util {

        // bah, i'm tired of chasing down dynamically loaded classes..

Modified: trunk/freenet/src/freenet/crypt/Yarrow.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Yarrow.java 2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/crypt/Yarrow.java 2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,23 +1,3 @@
-/*
-  Yarrow.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt;

 import java.io.BufferedOutputStream;
@@ -39,6 +19,12 @@

 import freenet.support.Logger;

+/*
+ * This code is part of the Java Adaptive Network Client by Ian Clarke. It is
+ * distributed under the GNU Public Licence (GPL) version 2. See
+ * http://www.gnu.org/ for further details of the GPL.
+ */
+
 /**
  * An implementation of the Yarrow PRNG in Java.
  * <p>

Modified: trunk/freenet/src/freenet/crypt/ciphers/Rijndael.java
===================================================================
--- trunk/freenet/src/freenet/crypt/ciphers/Rijndael.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/ciphers/Rijndael.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  Rijndael.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt.ciphers;

 import java.security.InvalidKeyException;
@@ -27,6 +7,12 @@
 import freenet.support.HexUtil;
 import freenet.support.Logger;

+/*
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
+*/
+
 /**
  * Interfaces with the Rijndael AES candidate to implement the Rijndael
  * algorithm

Modified: trunk/freenet/src/freenet/crypt/ciphers/Twofish.java
===================================================================
--- trunk/freenet/src/freenet/crypt/ciphers/Twofish.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/crypt/ciphers/Twofish.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  Twofish.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.crypt.ciphers;

 import freenet.crypt.BlockCipher;
@@ -25,6 +5,12 @@
 import freenet.support.Logger;
 import java.security.InvalidKeyException;

+/*
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
+*/
+
 /**
  * Interfaces with the Twofish AES candidate to implement the Twofish
  * algorithm

Modified: trunk/freenet/src/freenet/frost/message/FrostBoard.java
===================================================================
--- trunk/freenet/src/freenet/frost/message/FrostBoard.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/frost/message/FrostBoard.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,8 +1,7 @@
 /*
-  FrostMessageObject.java / Frost, Freenet
+  FrostMessageObject.java / Frost
   Copyright (C) 2003-2006  Frost Project <jtcfrost.sourceforge.net>
-  Public Domain 2006 VolodyA! V Anarhist <volodya at whengendarmesleeps.org>
-  Copyright (C) 2006 Freenet Project
+  Public Domain 2006  VolodyA! V A <volodya at whengendarmesleeps.org>

   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as

Modified: trunk/freenet/src/freenet/frost/message/FrostMessage.java
===================================================================
--- trunk/freenet/src/freenet/frost/message/FrostMessage.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/frost/message/FrostMessage.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,8 +1,7 @@
 /*
-  FrostMessageObject.java / Frost, Freenet
+  FrostMessageObject.java / Frost
   Copyright (C) 2003-2006  Frost Project <jtcfrost.sourceforge.net>
-  Public Domain 2006 VolodyA! V Anarhist <volodya at whengendarmesleeps.org>
-  Copyright (C) 2006 Freenet Project
+  Public Domain 2006  VolodyA! V A <volodya at whengendarmesleeps.org>

   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as

Modified: trunk/freenet/src/freenet/io/AddressIdentifier.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressIdentifier.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/io/AddressIdentifier.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,19 @@
 /*
-  AddressIdentifier.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io;

 import java.util.regex.Pattern;

Modified: trunk/freenet/src/freenet/io/AddressMatcher.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressMatcher.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/io/AddressMatcher.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,19 @@
 /*
-  AddressMatcher.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io;

 import java.net.InetAddress;

Modified: trunk/freenet/src/freenet/io/Inet4AddressMatcher.java
===================================================================
--- trunk/freenet/src/freenet/io/Inet4AddressMatcher.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/Inet4AddressMatcher.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,19 @@
 /*
-  Inet4AddressMatcher.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-
 package freenet.io;

 import java.net.Inet4Address;

Modified: trunk/freenet/src/freenet/io/Inet6AddressMatcher.java
===================================================================
--- trunk/freenet/src/freenet/io/Inet6AddressMatcher.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/Inet6AddressMatcher.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,19 @@
 /*
-  Inet6AddressMatcher.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io;

 import java.net.Inet6Address;

Modified: trunk/freenet/src/freenet/io/NetworkInterface.java
===================================================================
--- trunk/freenet/src/freenet/io/NetworkInterface.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/io/NetworkInterface.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,19 @@
 /*
-  .java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/io/WritableToDataOutputStream.java
===================================================================
--- trunk/freenet/src/freenet/io/WritableToDataOutputStream.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/WritableToDataOutputStream.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,22 @@
 /*
-  WritableToDataOutputStream.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
 package freenet.io;

 import java.io.*;

Modified: trunk/freenet/src/freenet/io/comm/DMT.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DMT.java  2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/io/comm/DMT.java  2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,24 +1,22 @@
 /*
-  DMT.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) Ian
-  Copyright (C) 2005-2006 The Free Network project
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 import java.util.LinkedList;

Modified: trunk/freenet/src/freenet/io/comm/DisconnectedException.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DisconnectedException.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/DisconnectedException.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DisconnectedException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 /**

Modified: trunk/freenet/src/freenet/io/comm/Dispatcher.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Dispatcher.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/io/comm/Dispatcher.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,30 +1,18 @@
 /*
-  Dispatcher.java / Freenet
-  Created on Jan 21, 2005
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-
-// TODO To change the template for this generated file go to
-// Window - Preferences - Java - Code Generation - Code and Comments
-
+ * Created on Jan 21, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Generation - Code and Comments
+ */
 package freenet.io.comm;


+/**
+ * @author root
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Generation - Code and Comments
+ */
 public interface Dispatcher {

     /**

Modified: trunk/freenet/src/freenet/io/comm/DummyPeerContext.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DummyPeerContext.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/DummyPeerContext.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  DummyPeerContext.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 /**

Modified: trunk/freenet/src/freenet/io/comm/DumpDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DumpDispatcher.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/DumpDispatcher.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  DumpDispatcher.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 /**

Modified: trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FreenetInetAddress.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 import java.io.DataInputStream;
@@ -33,6 +14,7 @@
  * Long-term InetAddress. If created with an IP address, then the IP address 
is primary.
  * If created with a name, then the name is primary, and the IP address can 
change.
  * Most code ripped from Peer.
+ * @author root
  *
  */
 public class FreenetInetAddress {

Modified: trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  IOStatisticLollector.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 import java.util.Date;

Modified: trunk/freenet/src/freenet/io/comm/IncorrectTypeException.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/IncorrectTypeException.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/IncorrectTypeException.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,22 @@
 /*
-  IncorrectTypeException.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 /**

Modified: trunk/freenet/src/freenet/io/comm/LowLevelFilter.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/LowLevelFilter.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/LowLevelFilter.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  LowLevelFilter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 /**

Modified: trunk/freenet/src/freenet/io/comm/LowLevelFilterException.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/LowLevelFilterException.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/LowLevelFilterException.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  LowLevelFilterException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 public class LowLevelFilterException extends Exception {

Modified: trunk/freenet/src/freenet/io/comm/Message.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Message.java      2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/io/comm/Message.java      2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,22 @@
 /*
-  Message.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 import java.io.*;

Modified: trunk/freenet/src/freenet/io/comm/MessageFilter.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageFilter.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/MessageFilter.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,24 +1,22 @@
 /*
-  MessageFilter.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) Ian
-  Copyright (C) 2005-2006 The Free Network project
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 import java.util.*;

Modified: trunk/freenet/src/freenet/io/comm/MessageType.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageType.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/io/comm/MessageType.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,22 @@
 /*
-  MessageType.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 import java.util.*;

Modified: trunk/freenet/src/freenet/io/comm/NotConnectedException.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/NotConnectedException.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/NotConnectedException.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  NotConnectedException.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 /**

Modified: trunk/freenet/src/freenet/io/comm/Peer.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Peer.java 2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/io/comm/Peer.java 2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,24 +1,22 @@
 /*
-  Peer.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) Ian
-  Copyright (C) 2005-2006 The Free Network project
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 import java.io.*;

Modified: trunk/freenet/src/freenet/io/comm/PeerContext.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/PeerContext.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/io/comm/PeerContext.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  PeerContext.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 /**

Modified: trunk/freenet/src/freenet/io/comm/PeerParseException.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/PeerParseException.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/PeerParseException.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  PeerParseException.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 /**

Modified: 
trunk/freenet/src/freenet/io/comm/ReferenceSignatureVerificationException.java
===================================================================
--- 
trunk/freenet/src/freenet/io/comm/ReferenceSignatureVerificationException.java  
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/io/comm/ReferenceSignatureVerificationException.java  
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  ReferenceSignatureVerificationException.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;

 /**

Modified: trunk/freenet/src/freenet/io/comm/RetrievalException.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/RetrievalException.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/RetrievalException.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,22 @@
 /*
-  RetrievalException.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.comm;



Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,21 @@
 /*
-  UdpSocketManager.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 package freenet.io.comm;

 import java.io.*;

Modified: trunk/freenet/src/freenet/io/xfer/AbortedException.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/AbortedException.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/xfer/AbortedException.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  AbortedException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io.xfer;

 /**

Modified: trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockReceiver.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/xfer/BlockReceiver.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,21 @@
 /*
-  BlockReceiver.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 package freenet.io.xfer;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,21 @@
 /*
-  BlockTransmitter.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 package freenet.io.xfer;

 import java.util.Iterator;

Modified: trunk/freenet/src/freenet/io/xfer/PacketThrottle.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/PacketThrottle.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/xfer/PacketThrottle.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,21 @@
 /*
-  PacketThrottle.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 package freenet.io.xfer;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBlock.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBlock.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBlock.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,21 @@
 /*
-  PartiallyReceivedBlock.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 package freenet.io.xfer;

 import java.util.Iterator;

Modified: trunk/freenet/src/freenet/keys/BaseClientKey.java
===================================================================
--- trunk/freenet/src/freenet/keys/BaseClientKey.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/BaseClientKey.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BaseClientKey.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/keys/CHKBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/CHKBlock.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/CHKBlock.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  CHKBlock.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.security.MessageDigest;

Modified: trunk/freenet/src/freenet/keys/CHKDecodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/CHKDecodeException.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/keys/CHKDecodeException.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  CHKDecodeException.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 /**

Modified: trunk/freenet/src/freenet/keys/CHKEncodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/CHKEncodeException.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/keys/CHKEncodeException.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  CHKEncodeException.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 /**

Modified: trunk/freenet/src/freenet/keys/CHKVerifyException.java
===================================================================
--- trunk/freenet/src/freenet/keys/CHKVerifyException.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/keys/CHKVerifyException.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  CHKVerifyException.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 /**

Modified: trunk/freenet/src/freenet/keys/ClientCHK.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientCHK.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/ClientCHK.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientCHK.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.io.DataInputStream;

Modified: trunk/freenet/src/freenet/keys/ClientCHKBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientCHKBlock.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/ClientCHKBlock.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  ClientCHKBlock.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/keys/ClientKSK.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientKSK.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/ClientKSK.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientKSK.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.io.UnsupportedEncodingException;

Modified: trunk/freenet/src/freenet/keys/ClientKey.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientKey.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/ClientKey.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientKey.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 /**

Modified: trunk/freenet/src/freenet/keys/ClientKeyBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientKeyBlock.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/ClientKeyBlock.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientKeyBlock.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/keys/ClientSSK.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientSSK.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/ClientSSK.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  ClientSSK.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.io.UnsupportedEncodingException;

Modified: trunk/freenet/src/freenet/keys/ClientSSKBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientSSKBlock.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/ClientSSKBlock.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientSSKBlock.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java      2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java      2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,7 +1,7 @@
 /*
-  FreenetURI.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  Public Domain 2006 VolodyA! V Anarhist <volodya at whengendarmesleeps.org>
+  FrostMessageObject.java / Frost
+  Copyright (C) The Free Network project
+  Public Domain 2006  VolodyA! V A <volodya at whengendarmesleeps.org>

   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -18,7 +18,6 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

-
 package freenet.keys;

 import java.io.ByteArrayInputStream;

Modified: trunk/freenet/src/freenet/keys/InsertableClientSSK.java
===================================================================
--- trunk/freenet/src/freenet/keys/InsertableClientSSK.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/keys/InsertableClientSSK.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  InsertableClientSSK.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/keys/InsertableUSK.java
===================================================================
--- trunk/freenet/src/freenet/keys/InsertableUSK.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/InsertableUSK.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  InsertableUSK.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/keys/Key.java
===================================================================
--- trunk/freenet/src/freenet/keys/Key.java     2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/keys/Key.java     2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,23 +1,3 @@
-/*
-  Key.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.io.DataInput;

Modified: trunk/freenet/src/freenet/keys/KeyBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/KeyBlock.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/KeyBlock.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  KeyBlock.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 /**

Modified: trunk/freenet/src/freenet/keys/KeyDecodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/KeyDecodeException.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/keys/KeyDecodeException.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  KeyDecodeException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 /**

Modified: trunk/freenet/src/freenet/keys/KeyEncodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/KeyEncodeException.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/keys/KeyEncodeException.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  KeyEncodeException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
 package freenet.keys;

 public class KeyEncodeException extends Exception {

Modified: trunk/freenet/src/freenet/keys/KeyVerifyException.java
===================================================================
--- trunk/freenet/src/freenet/keys/KeyVerifyException.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/keys/KeyVerifyException.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  KeyVerifyException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
 package freenet.keys;

 public class KeyVerifyException extends Exception {

Modified: trunk/freenet/src/freenet/keys/NodeCHK.java
===================================================================
--- trunk/freenet/src/freenet/keys/NodeCHK.java 2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/keys/NodeCHK.java 2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,22 +1,3 @@
-/*
-  NOdeCHK.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
 package freenet.keys;

 import java.io.DataInput;

Modified: trunk/freenet/src/freenet/keys/NodeSSK.java
===================================================================
--- trunk/freenet/src/freenet/keys/NodeSSK.java 2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/keys/NodeSSK.java 2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,21 +1,3 @@
-/*
-  NodeSSK.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
 package freenet.keys;

 import java.io.DataInput;

Modified: trunk/freenet/src/freenet/keys/SSKBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/SSKBlock.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/keys/SSKBlock.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SSKBlock.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
 package freenet.keys;

 import java.security.MessageDigest;

Modified: trunk/freenet/src/freenet/keys/SSKDecodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/SSKDecodeException.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/keys/SSKDecodeException.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SSKDecodeException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
 package freenet.keys;

 public class SSKDecodeException extends KeyDecodeException {

Modified: trunk/freenet/src/freenet/keys/SSKEncodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/SSKEncodeException.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/keys/SSKEncodeException.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SSKEncodeException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
 package freenet.keys;

 public class SSKEncodeException extends KeyEncodeException {

Modified: trunk/freenet/src/freenet/keys/SSKVerifyException.java
===================================================================
--- trunk/freenet/src/freenet/keys/SSKVerifyException.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/keys/SSKVerifyException.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SSKVerifyException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
 package freenet.keys;

 /**

Modified: trunk/freenet/src/freenet/keys/USK.java
===================================================================
--- trunk/freenet/src/freenet/keys/USK.java     2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/keys/USK.java     2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,22 +1,3 @@
-/*
-  USK.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.keys;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/node/AnyInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/AnyInsertSender.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/AnyInsertSender.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  AnyInsertSender.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 public interface AnyInsertSender {

Modified: trunk/freenet/src/freenet/node/AsyncMessageCallback.java
===================================================================
--- trunk/freenet/src/freenet/node/AsyncMessageCallback.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/AsyncMessageCallback.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  AsyncMessageCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 /**

Modified: trunk/freenet/src/freenet/node/BaseRequestThrottle.java
===================================================================
--- trunk/freenet/src/freenet/node/BaseRequestThrottle.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/BaseRequestThrottle.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BaseRequestThrottle.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 public interface BaseRequestThrottle {

Modified: trunk/freenet/src/freenet/node/ByteCounter.java
===================================================================
--- trunk/freenet/src/freenet/node/ByteCounter.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/ByteCounter.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ByteCounter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 /**

Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  CHKInsertSender.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.util.HashSet;

Modified: trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
===================================================================
--- trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java 
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java 
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  CPUAdjustingSwapRequestInterval.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.support.Logger;

Modified: trunk/freenet/src/freenet/node/CPUUsageMonitor.java
===================================================================
--- trunk/freenet/src/freenet/node/CPUUsageMonitor.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/CPUUsageMonitor.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  CPUUsageMonitor.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/freenet/node/DNSRequester.java
===================================================================
--- trunk/freenet/src/freenet/node/DNSRequester.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/DNSRequester.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  DNSRequester.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.support.Logger;

Modified: trunk/freenet/src/freenet/node/DSAPublicKeyDatabase.java
===================================================================
--- trunk/freenet/src/freenet/node/DSAPublicKeyDatabase.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/DSAPublicKeyDatabase.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DSAPublicKeyDatabase.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.crypt.DSAPublicKey;

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  FNPPacketMangler.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.security.MessageDigest;

Modified: trunk/freenet/src/freenet/node/FSParseException.java
===================================================================
--- trunk/freenet/src/freenet/node/FSParseException.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/FSParseException.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FSParseException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 /**

Modified: trunk/freenet/src/freenet/node/FastRunnable.java
===================================================================
--- trunk/freenet/src/freenet/node/FastRunnable.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/FastRunnable.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FastRunnable.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 /**

Modified: trunk/freenet/src/freenet/node/GlobalProbe.java
===================================================================
--- trunk/freenet/src/freenet/node/GlobalProbe.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/GlobalProbe.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  GlobalProbe.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.support.Logger;

Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  IPDetectorPluginManager.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.net.InetAddress;

Modified: trunk/freenet/src/freenet/node/InsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertHandler.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/InsertHandler.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  InsertHandler.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.io.comm.DMT;

Modified: trunk/freenet/src/freenet/node/KeyChangedException.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyChangedException.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/KeyChangedException.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  KeyChangedException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 /**

Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java      2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/KeyTracker.java      2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  KeyTracker.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.util.Enumeration;

Modified: trunk/freenet/src/freenet/node/Location.java
===================================================================
--- trunk/freenet/src/freenet/node/Location.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/Location.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  Location.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.crypt.RandomSource;

Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  LocationManager.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.security.MessageDigest;

Modified: trunk/freenet/src/freenet/node/LoggingConfigHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/LoggingConfigHandler.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/LoggingConfigHandler.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  LoggingConfigHandler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/LowLevelGetException.java
===================================================================
--- trunk/freenet/src/freenet/node/LowLevelGetException.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/LowLevelGetException.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  LowLevelGetException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 public class LowLevelGetException extends Exception {

Modified: trunk/freenet/src/freenet/node/LowLevelPutException.java
===================================================================
--- trunk/freenet/src/freenet/node/LowLevelPutException.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/LowLevelPutException.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  LowLevelPutException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 public class LowLevelPutException extends Exception {

Modified: trunk/freenet/src/freenet/node/MemoryChecker.java
===================================================================
--- trunk/freenet/src/freenet/node/MemoryChecker.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/MemoryChecker.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  MemoryChecker.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.support.Logger;

Modified: trunk/freenet/src/freenet/node/MessageItem.java
===================================================================
--- trunk/freenet/src/freenet/node/MessageItem.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/MessageItem.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  MessageItem.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.io.comm.Message;

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/node/Node.java    2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,26 +1,4 @@
 /*
-  Node.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-
-
-/*
  * Freenet 0.7 node.
  * 
  * Designed primarily for darknet operation, but should also be usable

Modified: trunk/freenet/src/freenet/node/NodeARKInserter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeARKInserter.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/NodeARKInserter.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,6 @@
-/*
-  NodeARKInserter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+/**
+ * 
+ */
 package freenet.node;

 import java.io.UnsupportedEncodingException;

Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  NodeClientCore.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  NodeDispatcher.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.util.HashSet;

Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  NodeIPDetector.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.net.InetAddress;

Modified: trunk/freenet/src/freenet/node/NodePinger.java
===================================================================
--- trunk/freenet/src/freenet/node/NodePinger.java      2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/NodePinger.java      2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  NodePinger.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.util.Arrays;

Modified: trunk/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStarter.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/NodeStarter.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  NodeStarter.java / Freenet
-  Copyright (C) nextgens
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  PacketSender.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.util.LinkedList;

Modified: trunk/freenet/src/freenet/node/PacketSequenceException.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSequenceException.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/PacketSequenceException.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PacketSequenceException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.io.comm.LowLevelFilterException;

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  PeerManager.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  PeerNode.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/freenet/node/PeerNodeStatus.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNodeStatus.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/PeerNodeStatus.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  PeerNodeStatus.java / Freenet
-  Copyright (C) David 'Bombe' Roden
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.util.Hashtable;

Modified: trunk/freenet/src/freenet/node/ProbeCallback.java
===================================================================
--- trunk/freenet/src/freenet/node/ProbeCallback.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/ProbeCallback.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ProbeCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 /** Callback for a locally initiated probe request */

Modified: trunk/freenet/src/freenet/node/RealNodePingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/RealNodePingTest.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/RealNodePingTest.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  RealNodePingTest.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.crypt.DiffieHellman;

Modified: trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  RealNodeRequestInsertTest.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/RealNodeRoutingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/RealNodeRoutingTest.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/RealNodeRoutingTest.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  REalNodeRoutingTest.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  RequestHandler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.crypt.DSAPublicKey;

Modified: trunk/freenet/src/freenet/node/RequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestScheduler.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/RequestScheduler.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  RequestScheduler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 public interface RequestScheduler {

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  RequestSender.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarter.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/RequestStarter.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  RequestStarter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.support.Logger;

Modified: trunk/freenet/src/freenet/node/RequestStarterGroup.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarterGroup.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/RequestStarterGroup.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  RequestStarterGroup.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.client.async.ClientRequestScheduler;

Modified: trunk/freenet/src/freenet/node/ResendPacketItem.java
===================================================================
--- trunk/freenet/src/freenet/node/ResendPacketItem.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/ResendPacketItem.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ResendPacketItem.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 /**

Modified: trunk/freenet/src/freenet/node/RoutingContext.java
===================================================================
--- trunk/freenet/src/freenet/node/RoutingContext.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/RoutingContext.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  RoutingContext.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.util.HashSet;

Modified: trunk/freenet/src/freenet/node/SSKInsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertHandler.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/SSKInsertHandler.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SSKInsertHandler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SSKInsertSender.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.security.MessageDigest;

Modified: trunk/freenet/src/freenet/node/SendMessageOnErrorCallback.java
===================================================================
--- trunk/freenet/src/freenet/node/SendMessageOnErrorCallback.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/SendMessageOnErrorCallback.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SendMessageOnErrorCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.io.comm.Message;

Modified: trunk/freenet/src/freenet/node/SendableGet.java
===================================================================
--- trunk/freenet/src/freenet/node/SendableGet.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/SendableGet.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SendableGet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.keys.ClientKey;

Modified: trunk/freenet/src/freenet/node/SendableInsert.java
===================================================================
--- trunk/freenet/src/freenet/node/SendableInsert.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/SendableInsert.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SendableInsert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 /**

Modified: trunk/freenet/src/freenet/node/SendableRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/SendableRequest.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/SendableRequest.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SendableRequest.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.client.async.ClientRequester;

Modified: trunk/freenet/src/freenet/node/SimpleSendableInsert.java
===================================================================
--- trunk/freenet/src/freenet/node/SimpleSendableInsert.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/SimpleSendableInsert.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SimpleSendableInsert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.client.async.ClientRequester;

Modified: trunk/freenet/src/freenet/node/StaticSwapRequestInterval.java
===================================================================
--- trunk/freenet/src/freenet/node/StaticSwapRequestInterval.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/StaticSwapRequestInterval.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StaticSwapRequestInterval.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 public class StaticSwapRequestInterval implements SwapRequestInterval {

Modified: trunk/freenet/src/freenet/node/SwapRequestInterval.java
===================================================================
--- trunk/freenet/src/freenet/node/SwapRequestInterval.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/SwapRequestInterval.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SwapRequestInterval.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 /**

Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  TestnetHandler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/freenet/node/TestnetStatusUploader.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetStatusUploader.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/TestnetStatusUploader.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  TestnetStatusUploader.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  TextModeClientInterface.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  TextModeClientInterfaceServer.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/ThrottleWindowManager.java
===================================================================
--- trunk/freenet/src/freenet/node/ThrottleWindowManager.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/ThrottleWindowManager.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ThrottleWindowManager.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 import freenet.support.Logger;

Modified: trunk/freenet/src/freenet/node/Ticker.java
===================================================================
--- trunk/freenet/src/freenet/node/Ticker.java  2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/node/Ticker.java  2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,22 +1,3 @@
-/*
-  Ticker.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node;

 public interface Ticker {

Modified: trunk/freenet/src/freenet/node/fcp/AddPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AddPeer.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/AddPeer.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  AddPeer.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/freenet/node/fcp/AllDataMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AllDataMessage.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/AllDataMessage.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  AllDataMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/BaseDataCarryingMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/BaseDataCarryingMessage.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/BaseDataCarryingMessage.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BaseDataCarryingMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientGet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientGetMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientHelloMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientPut.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutBase.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutBase.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientPutBase.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientPutComplexDirMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDir.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDir.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientPutDir.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientPutDirMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientPutDiskDirMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientPutMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ClientRequest.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.BufferedReader;

Modified: 
trunk/freenet/src/freenet/node/fcp/CloseConnectionDuplicateClientNameMessage.java
===================================================================
--- 
trunk/freenet/src/freenet/node/fcp/CloseConnectionDuplicateClientNameMessage.java
   2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/node/fcp/CloseConnectionDuplicateClientNameMessage.java
   2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  CloseConnectionDuplicateClientNameMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DataCarryingMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/fcp/DataFoundMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DataFoundMessage.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/DataFoundMessage.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DataFoundMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.client.FetchResult;

Modified: trunk/freenet/src/freenet/node/fcp/DirPutFile.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DirPutFile.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/DirPutFile.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DirPutFile.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.client.ClientMetadata;

Modified: trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/DirectDirPutFile.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DirectDirPutFile.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/fcp/DiskDirPutFile.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DiskDirPutFile.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/DiskDirPutFile.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DiskDirPutFile.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/fcp/EndListPeersMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/EndListPeersMessage.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/EndListPeersMessage.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  EndListPeersMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: 
trunk/freenet/src/freenet/node/fcp/EndListPersistentRequestsMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/EndListPersistentRequestsMessage.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/EndListPersistentRequestsMessage.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  EndListPersistentRequestsMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPClient.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/FCPClient.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FCPClient.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FCPConnectionHandler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FCPConnectionInputHandler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FCPConnectionOutputHandler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/fcp/FCPMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPMessage.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/FCPMessage.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FCPMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FCPServer.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.BufferedInputStream;

Modified: trunk/freenet/src/freenet/node/fcp/FinishedCompressionMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FinishedCompressionMessage.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/FinishedCompressionMessage.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FinishedCompressionMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.client.events.FinishedCompressionEvent;

Modified: trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  GenerateSSKMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  GetFailedMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  GetRequestStatusMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/IdentifierCollisionException.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/IdentifierCollisionException.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/IdentifierCollisionException.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  IdentifierCollisionException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 /**

Modified: trunk/freenet/src/freenet/node/fcp/IdentifierCollisionMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/IdentifierCollisionMessage.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/IdentifierCollisionMessage.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  IdentifierCollisionMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ListPeersMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ListPersistentRequestsMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/MessageInvalidException.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/MessageInvalidException.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/MessageInvalidException.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  MessageInvalidException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 /**

Modified: trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPeer.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPeer.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ModifyPeer.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ModifyPersistentRequest.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  NodeHelloMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/Peer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/Peer.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/Peer.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Peer.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/PeerRemoved.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PeerRemoved.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/PeerRemoved.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PeerRemoved.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/PersistenceParseException.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistenceParseException.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/PersistenceParseException.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PersistenceParseException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 /**

Modified: trunk/freenet/src/freenet/node/fcp/PersistentGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentGet.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/PersistentGet.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PersistentGet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/fcp/PersistentPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentPut.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/PersistentPut.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PersistentPut.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.io.File;

Modified: trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PersistentPutDir.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ProtocolErrorMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PutFailedMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PutSuccessfulMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/RedirectDirPutFile.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  RedirectDirPutFile.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/node/fcp/RemovePeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RemovePeer.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/RemovePeer.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  RemovePeer.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  RevmovePersistentRequest.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/SSKKeypairMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SSKKeypairMessage.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/SSKKeypairMessage.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SSKKeypairMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ShutdownMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SimpleProgressMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.client.events.SplitfileProgressEvent;

Modified: trunk/freenet/src/freenet/node/fcp/StartedCompressionMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/StartedCompressionMessage.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/StartedCompressionMessage.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  StartedCompressionMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/fcp/SubscribeUSK.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SubscribeUSK.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/SubscribeUSK.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SubscribeUSK.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.client.async.USKCallback;

Modified: trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SubscribeUSKMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/node/fcp/SubscribedUSKUpdate.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SubscribedUSKUpdate.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/SubscribedUSKUpdate.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SubsribeUSKUpdate.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.keys.USK;

Modified: trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  URIGeneratedMessage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.keys.FreenetURI;

Modified: trunk/freenet/src/freenet/node/fcp/WatchGlobal.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/WatchGlobal.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/node/fcp/WatchGlobal.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  WatchGlobal.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.fcp;

 import freenet.node.Node;

Modified: trunk/freenet/src/freenet/node/updater/AutoUpdateAllowedCallback.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/AutoUpdateAllowedCallback.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/updater/AutoUpdateAllowedCallback.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  AutoUpdateAllowedCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.updater;

 import freenet.config.BooleanCallback;

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  NodeUpdater.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.updater;

 import java.io.BufferedInputStream;

Modified: 
trunk/freenet/src/freenet/node/updater/PrivkeyHasBeenBlownException.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/PrivkeyHasBeenBlownException.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/updater/PrivkeyHasBeenBlownException.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PrivkeyHasBeenBlownException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.updater;

 import freenet.support.HTMLEncoder;

Modified: 
trunk/freenet/src/freenet/node/updater/UpdateRevocationURICallback.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateRevocationURICallback.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/updater/UpdateRevocationURICallback.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  UpdateRevocationURICallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.updater;

 import freenet.config.StringCallback;

Modified: trunk/freenet/src/freenet/node/updater/UpdateURICallback.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateURICallback.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/updater/UpdateURICallback.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  UpdateURICallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.updater;

 import freenet.config.StringCallback;

Modified: trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  UpdaterEnabledCallback.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.updater;

 import org.tanukisoftware.wrapper.WrapperManager;

Modified: trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java 
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/useralerts/BuildOldAgeUserAlert.java 
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BuildOldAgeUserAlert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.useralerts;

 import freenet.support.HTMLNode;

Modified: trunk/freenet/src/freenet/node/useralerts/ExtOldAgeUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/ExtOldAgeUserAlert.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/useralerts/ExtOldAgeUserAlert.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ExtOldAgeUserAlert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.useralerts;

 import freenet.support.HTMLNode;

Modified: trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  IPUndetectedUserAlert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.useralerts;

 import freenet.node.NodeIPDetector;

Modified: 
trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  MeaningfulNodeNameUserAlert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.useralerts;

 import freenet.config.Option;

Modified: trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  N2NTMUserAlert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.useralerts;

 import freenet.node.PeerNode;

Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java 
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java 
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PeerManagerUserAlert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.useralerts;

 import freenet.node.Node;

Modified: 
trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/useralerts/RevocationKeyFoundUserAlert.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  RevocationKeyFoundUserAlert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.useralerts;

 import freenet.support.HTMLNode;

Modified: trunk/freenet/src/freenet/node/useralerts/SimpleUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/SimpleUserAlert.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/useralerts/SimpleUserAlert.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SimpleUserAlert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.useralerts;

 import freenet.support.HTMLNode;

Modified: 
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
--- 
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java 
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java 
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,114 +1,95 @@
-/*
-  UpdatedVersionAvailableUserAlert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-package freenet.node.useralerts;
-
-import freenet.node.updater.NodeUpdater;
-import freenet.support.HTMLNode;
-
-public class UpdatedVersionAvailableUserAlert implements UserAlert {
-       private boolean isValid, isReady;
-       private final NodeUpdater updater;
-       private int version;
-       private int readyVersion;
-
-       public UpdatedVersionAvailableUserAlert(int version, NodeUpdater 
updater){
-               this.version=version;
-               isValid=false;
-               isReady=false;
-               this.updater = updater;
-       }
-       
-       public synchronized void set(int availableVersion, int readyVersion, 
boolean ready){
-               version = availableVersion;
-               this.readyVersion = readyVersion;
-               isReady = ready;
-       }
-       
-       public boolean userCanDismiss() {
-               return false;
-       }
-
-       public String getTitle() {
-               return "A new stable version of Freenet is available 
("+version+")";
-       }
-
-       public String getText() {
-               String s ="It seems that your node isn't running the latest 
version of the software. ";
-               if(updater.inFinalCheck()) {
-                       return s + "Your node is currently doing a final check 
to verify the security of the update"+
-                       (version == readyVersion ? "" : (" to "+readyVersion)) +
-                       ". 
("+updater.getRevocationDNFCounter()+"/"+NodeUpdater.REVOCATION_DNF_MIN+")";
-               } else {
-                       s+="Updating to "+version+" is advised. ";
-                       if(isReady) s += " <form action=\"/\" 
method=\"post\"><input type=\"submit\" name=\"update\" value=\"Update to 
"+readyVersion+" Now\" /></form>";
-                       if(readyVersion < version || !isReady)
+package freenet.node.useralerts;
+
+import freenet.node.updater.NodeUpdater;
+import freenet.support.HTMLNode;
+
+public class UpdatedVersionAvailableUserAlert implements UserAlert {
+       private boolean isValid, isReady;
+       private final NodeUpdater updater;
+       private int version;
+       private int readyVersion;
+
+       public UpdatedVersionAvailableUserAlert(int version, NodeUpdater 
updater){
+               this.version=version;
+               isValid=false;
+               isReady=false;
+               this.updater = updater;
+       }
+       
+       public synchronized void set(int availableVersion, int readyVersion, 
boolean ready){
+               version = availableVersion;
+               this.readyVersion = readyVersion;
+               isReady = ready;
+       }
+       
+       public boolean userCanDismiss() {
+               return false;
+       }
+
+       public String getTitle() {
+               return "A new stable version of Freenet is available 
("+version+")";
+       }
+
+       public String getText() {
+               String s ="It seems that your node isn't running the latest 
version of the software. ";
+               if(updater.inFinalCheck()) {
+                       return s + "Your node is currently doing a final check 
to verify the security of the update"+
+                       (version == readyVersion ? "" : (" to "+readyVersion)) +
+                       ". 
("+updater.getRevocationDNFCounter()+"/"+NodeUpdater.REVOCATION_DNF_MIN+")";
+               } else {
+                       s+="Updating to "+version+" is advised. ";
+                       if(isReady) s += " <form action=\"/\" 
method=\"post\"><input type=\"submit\" name=\"update\" value=\"Update to 
"+readyVersion+" Now\" /></form>";
+                       if(readyVersion < version || !isReady)
                                s += "Your node is currently fetching the 
update over Freenet. Once this is complete, you will be prompted to install the 
new version. Please be patient, this could take up to half an hour.";
-                       return s;
-               }
-       }
-
-       public HTMLNode getHTMLText() {
-               HTMLNode alertNode = new HTMLNode("div");
-               alertNode.addChild("#", "It seems that your node isn't running 
the latest version of the software.");
-               if (updater.inFinalCheck()) {
-                       alertNode.addChild("#", " Your node is currently doing 
a final check to verify the security of the update " + (version == readyVersion 
? "" : (" to " + readyVersion)) + ". (Finished checks: " + 
updater.getRevocationDNFCounter() + " of " + NodeUpdater.REVOCATION_DNF_MIN + 
")");
-               } else {
-                       if (isReady) {
-                               alertNode.addChild("#", " Updating to " + 
version + " is advised.");
-                               alertNode.addChild("form", new String[] { 
"action", "method" }, new String[] { "/", "post" }).addChild("input", new 
String[] { "type", "name", "value" }, new String[] { "submit", "update", 
"Update to " + readyVersion + " now" });
-                               if(readyVersion < version)
-                                       alertNode.addChild("#", "The node is 
currently fetching version "+version+" but you can update to "+readyVersion+" 
now, or wait for the node to fetch "+version+".");
-                       } else {
-                               if(updater.isAutoUpdateAllowed)
-                                       alertNode.addChild("#", " Your node is 
currently fetching the update over Freenet and will automatically restart when 
it's ready (as configured).");
-                               else
-                                       alertNode.addChild("#", " Your node is 
currently fetching the update over Freenet. Once this is complete, you will be 
prompted to install the new version. Please be patient, this could take up to 
half an hour.");
-                       }
-               }
-               return alertNode;
-       }
-       
-       public short getPriorityClass() {
-               if(isReady || updater.inFinalCheck())
-                       return UserAlert.WARNING;
-               else
-                       return UserAlert.MINOR;
-       }
-       
-       public boolean isValid() {
-               return isValid;
-       }
-       
-       public void isValid(boolean b){
-               isValid=b;
-       }
-       
-       public String dismissButtonText(){
-               return "Hide";
-       }
-       
-       public boolean shouldUnregisterOnDismiss() {
-               return false;
-       }
+                       return s;
+               }
+       }
+
+       public HTMLNode getHTMLText() {
+               HTMLNode alertNode = new HTMLNode("div");
+               alertNode.addChild("#", "It seems that your node isn't running 
the latest version of the software.");
+               if (updater.inFinalCheck()) {
+                       alertNode.addChild("#", " Your node is currently doing 
a final check to verify the security of the update " + (version == readyVersion 
? "" : (" to " + readyVersion)) + ". (Finished checks: " + 
updater.getRevocationDNFCounter() + " of " + NodeUpdater.REVOCATION_DNF_MIN + 
")");
+               } else {
+                       if (isReady) {
+                               alertNode.addChild("#", " Updating to " + 
version + " is advised.");
+                               alertNode.addChild("form", new String[] { 
"action", "method" }, new String[] { "/", "post" }).addChild("input", new 
String[] { "type", "name", "value" }, new String[] { "submit", "update", 
"Update to " + readyVersion + " now" });
+                               if(readyVersion < version)
+                                       alertNode.addChild("#", "The node is 
currently fetching version "+version+" but you can update to "+readyVersion+" 
now, or wait for the node to fetch "+version+".");
+                       } else {
+                               if(updater.isAutoUpdateAllowed)
+                                       alertNode.addChild("#", " Your node is 
currently fetching the update over Freenet and will automatically restart when 
it's ready (as configured).");
+                               else
+                                       alertNode.addChild("#", " Your node is 
currently fetching the update over Freenet. Once this is complete, you will be 
prompted to install the new version. Please be patient, this could take up to 
half an hour.");
+                       }
+               }
+               return alertNode;
+       }

+       public short getPriorityClass() {
+               if(isReady || updater.inFinalCheck())
+                       return UserAlert.WARNING;
+               else
+                       return UserAlert.MINOR;
+       }
+       
+       public boolean isValid() {
+               return isValid;
+       }
+       
+       public void isValid(boolean b){
+               isValid=b;
+       }
+       
+       public String dismissButtonText(){
+               return "Hide";
+       }
+       
+       public boolean shouldUnregisterOnDismiss() {
+               return false;
+       }
+       
        public void onDismiss() {
                // do nothing on alert dismissal
        }
-}
+}

Modified: trunk/freenet/src/freenet/node/useralerts/UserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlert.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlert.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  UserAlert.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.useralerts;

 import freenet.support.HTMLNode;

Modified: trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  UserAlertManager.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.node.useralerts;

 import java.util.Arrays;

Modified: trunk/freenet/src/freenet/plugin/HttpPlugin.java
===================================================================
--- trunk/freenet/src/freenet/plugin/HttpPlugin.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/plugin/HttpPlugin.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  HttpPlugin.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  Copyright (C) 2006 David 'Bombe' Roden <bombe at freenetproject.org>
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.plugin;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/plugin/Plugin.java
===================================================================
--- trunk/freenet/src/freenet/plugin/Plugin.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/plugin/Plugin.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Plugin.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  Copyright (C) 2006 David 'Bombe' Roden <bombe at freenetproject.org>
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.plugin;

 /**

Modified: trunk/freenet/src/freenet/plugin/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/plugin/PluginManager.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/plugin/PluginManager.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PluginManager.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  Copyright (C) 2006 David 'Bombe' Roden <bombe at freenetproject.org>
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.plugin;

 import java.net.MalformedURLException;

Modified: trunk/freenet/src/freenet/plugin/TestHttpPlugin.java
===================================================================
--- trunk/freenet/src/freenet/plugin/TestHttpPlugin.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/plugin/TestHttpPlugin.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,6 @@
-/*
-  TestHttpPlugin.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  Copyright (C) 2006 David 'Bombe' Roden <bombe at freenetproject.org>
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+/**
+ * 
+ */
 package freenet.plugin;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/plugin/TestPlugin.java
===================================================================
--- trunk/freenet/src/freenet/plugin/TestPlugin.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/plugin/TestPlugin.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,6 @@
-/*
-  TestPlugin.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  Copyright (C) 2006 David 'Bombe' Roden <bombe at freenetproject.org>
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+/**
+ * 
+ */
 package freenet.plugin;

 /**

Modified: trunk/freenet/src/freenet/pluginmanager/DetectedIP.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/DetectedIP.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/DetectedIP.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  DetectedIP.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 import java.net.InetAddress;

Modified: trunk/freenet/src/freenet/pluginmanager/FredPlugin.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/FredPlugin.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/FredPlugin.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  FredPlugin.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 public interface FredPlugin {

Modified: trunk/freenet/src/freenet/pluginmanager/FredPluginHTTP.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/FredPluginHTTP.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/FredPluginHTTP.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  FredPluginHTTP.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 import freenet.clients.http.HTTPRequest;

Modified: trunk/freenet/src/freenet/pluginmanager/FredPluginIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/FredPluginIPDetector.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/FredPluginIPDetector.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  FredPluginIPDetector.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 public interface FredPluginIPDetector {

Modified: trunk/freenet/src/freenet/pluginmanager/FredPluginThreadless.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/FredPluginThreadless.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/FredPluginThreadless.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  FredPluginThreadless.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 public interface FredPluginThreadless {

Modified: trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PluginHTTPException.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 public class PluginHTTPException extends Exception {

Modified: trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginHandler.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/PluginHandler.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PluginHandler.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  Copyright (C) cyberdo
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 /**

Modified: trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PluginInfoWrapper.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 import java.util.Date;

Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PluginManager.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/freenet/pluginmanager/PluginNotFoundException.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginNotFoundException.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/PluginNotFoundException.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PluginNotFoundException.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 public class PluginNotFoundException extends Exception {

Modified: trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PluginRespirator.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 import freenet.client.HighLevelSimpleClient;

Modified: trunk/freenet/src/freenet/pluginmanager/PluginSecurityException.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginSecurityException.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/PluginSecurityException.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PluginSecurityException.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 public class PluginSecurityException extends Exception {

Modified: trunk/freenet/src/freenet/pluginmanager/TestPlugin.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/TestPlugin.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/pluginmanager/TestPlugin.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  TestPlugin.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.pluginmanager;

 import java.util.Random;

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BerkeleyDBFreenetStore.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  Copyright (C) tubbie
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.store;

 import java.io.EOFException;

Modified: trunk/freenet/src/freenet/store/Block.java
===================================================================
--- trunk/freenet/src/freenet/store/Block.java  2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/store/Block.java  2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,22 +1,22 @@
 /*
-  Block.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2005-2006 The Free Network project
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.store;

 import freenet.keys.Key;

Modified: trunk/freenet/src/freenet/store/FreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/FreenetStore.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/store/FreenetStore.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  FreenetStore.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.store;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/store/KeyCollisionException.java
===================================================================
--- trunk/freenet/src/freenet/store/KeyCollisionException.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/store/KeyCollisionException.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  KeyCollisionException.java / Freenet
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.store;

 public class KeyCollisionException extends Exception {

Modified: trunk/freenet/src/freenet/store/Store.java
===================================================================
--- trunk/freenet/src/freenet/store/Store.java  2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/store/Store.java  2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,22 +1,22 @@
 /*
-  Store.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2005-2006 The Free Network project
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.store;

 import java.io.*;

Modified: trunk/freenet/src/freenet/support/Base64.java
===================================================================
--- trunk/freenet/src/freenet/support/Base64.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/Base64.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Base64.java / Freenet
-  Copyright Stephen Blackheath
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Random;

Modified: trunk/freenet/src/freenet/support/BitArray.java
===================================================================
--- trunk/freenet/src/freenet/support/BitArray.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/BitArray.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,22 @@
 /*
-  BitArray.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.io.*;

Modified: trunk/freenet/src/freenet/support/Buffer.java
===================================================================
--- trunk/freenet/src/freenet/support/Buffer.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/Buffer.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,22 @@
 /*
-  Buffer.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.io.*;

Modified: trunk/freenet/src/freenet/support/CPUInformation/AMDCPUInfo.java
===================================================================
--- trunk/freenet/src/freenet/support/CPUInformation/AMDCPUInfo.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/CPUInformation/AMDCPUInfo.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,7 @@
 /*
-  AMDCPUInfo.java / Freenet
-  Jul 17, 2004
-  Copyright (C) 2004 Iakin 
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Created on Jul 17, 2004
+ *
+ */
 package freenet.support.CPUInformation;

 /**

Modified: trunk/freenet/src/freenet/support/CPUInformation/CPUID.java
===================================================================
--- trunk/freenet/src/freenet/support/CPUInformation/CPUID.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/CPUInformation/CPUID.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,23 +1,6 @@
 /*
-  CPUID.java / Freenet
-  Created on Jul 14, 2004
-  Copyright (C) 2004 Iakin
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Created on Jul 14, 2004
+ */
 package freenet.support.CPUInformation;

 import java.io.File;

Modified: trunk/freenet/src/freenet/support/CPUInformation/CPUInfo.java
===================================================================
--- trunk/freenet/src/freenet/support/CPUInformation/CPUInfo.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/CPUInformation/CPUInfo.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,7 @@
 /*
-  CPUInfo.java / Freenet
-  Created on Jul 16, 2004
-  Copyright (C) 2004 Iakin 
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Created on Jul 16, 2004
+ *
+ */
 package freenet.support.CPUInformation;

 /**

Modified: trunk/freenet/src/freenet/support/CPUInformation/IntelCPUInfo.java
===================================================================
--- trunk/freenet/src/freenet/support/CPUInformation/IntelCPUInfo.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/CPUInformation/IntelCPUInfo.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,7 @@
 /*
-  IntelCPUInfo.java / Freenet
-  Created on Jul 17, 2004
-  Copyright (C) 2004 Iakin
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Created on Jul 17, 2004
+ *
+ */
 package freenet.support.CPUInformation;

 /**

Modified: 
trunk/freenet/src/freenet/support/CPUInformation/UnknownCPUException.java
===================================================================
--- trunk/freenet/src/freenet/support/CPUInformation/UnknownCPUException.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/CPUInformation/UnknownCPUException.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,6 @@
 /*
-  UnknownCPUException.java / Freenet
-  Created on Jul 16, 2004
-  Copyright (C) 2004 Iakin
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Created on Jul 16, 2004
+ */
 package freenet.support.CPUInformation;

 /**

Modified: trunk/freenet/src/freenet/support/DoubleTokenBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/DoubleTokenBucket.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/DoubleTokenBucket.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  DoubleTokenBucket.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 /**

Modified: trunk/freenet/src/freenet/support/DoublyLinkedList.java
===================================================================
--- trunk/freenet/src/freenet/support/DoublyLinkedList.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/DoublyLinkedList.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DoublyLinkedList.java / Freenet
-  Copyright (C) tavin
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Enumeration;

Modified: trunk/freenet/src/freenet/support/DoublyLinkedListImpl.java
===================================================================
--- trunk/freenet/src/freenet/support/DoublyLinkedListImpl.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/DoublyLinkedListImpl.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  DoublyLinkedListImpl.java / Freenet
-  Copyright (C) tavin
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Enumeration;

Modified: trunk/freenet/src/freenet/support/Fields.java
===================================================================
--- trunk/freenet/src/freenet/support/Fields.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/Fields.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Fields.java / Freenet
-  Copyright (C) oskar
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.text.DateFormat;

Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FileLoggerHook.java / Freenet
-  Copyright (C) oskar
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.io.BufferedOutputStream;

Modified: trunk/freenet/src/freenet/support/HTMLDecoder.java
===================================================================
--- trunk/freenet/src/freenet/support/HTMLDecoder.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/HTMLDecoder.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  HTMLDecoder.java / Freenet
-  Copyright (C) Yves Lempereur (avian)
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/support/HTMLEncoder.java
===================================================================
--- trunk/freenet/src/freenet/support/HTMLEncoder.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/HTMLEncoder.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  HTMLEncoder.java / Freenet
-  Copyright (C) Yves Lempereur
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/support/HTMLNode.java
===================================================================
--- trunk/freenet/src/freenet/support/HTMLNode.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/HTMLNode.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  HTMLNode.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.ArrayList;

Modified: trunk/freenet/src/freenet/support/HexUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/HexUtil.java      2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/HexUtil.java      2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  HexUtil.java / Freenet
-  Copyright (C) syoung
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.io.DataInputStream;

Modified: trunk/freenet/src/freenet/support/IllegalBase64Exception.java
===================================================================
--- trunk/freenet/src/freenet/support/IllegalBase64Exception.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/IllegalBase64Exception.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  IllegalBase64Exception.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 /**

Modified: trunk/freenet/src/freenet/support/ImmutableByteArrayWrapper.java
===================================================================
--- trunk/freenet/src/freenet/support/ImmutableByteArrayWrapper.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/ImmutableByteArrayWrapper.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,6 @@
-/*
-  ImmutalbeByteArrayWrapper.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+/**
+ * 
+ */
 package freenet.support;

 import java.util.Arrays;

Modified: 
trunk/freenet/src/freenet/support/IndexableUpdatableSortedLinkedListItem.java
===================================================================
--- 
trunk/freenet/src/freenet/support/IndexableUpdatableSortedLinkedListItem.java   
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/support/IndexableUpdatableSortedLinkedListItem.java   
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  IndexableUpdatableSortedLinkedListItem.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 public interface IndexableUpdatableSortedLinkedListItem extends

Modified: trunk/freenet/src/freenet/support/IntNumberedItem.java
===================================================================
--- trunk/freenet/src/freenet/support/IntNumberedItem.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/IntNumberedItem.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  IntNumberedItem.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 /**

Modified: trunk/freenet/src/freenet/support/LRUHashtable.java
===================================================================
--- trunk/freenet/src/freenet/support/LRUHashtable.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/LRUHashtable.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  LRUHashtable.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Enumeration;

Modified: trunk/freenet/src/freenet/support/LRUQueue.java
===================================================================
--- trunk/freenet/src/freenet/support/LRUQueue.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/LRUQueue.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  LRUQueue.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Enumeration;

Modified: trunk/freenet/src/freenet/support/LimitedEnumeration.java
===================================================================
--- trunk/freenet/src/freenet/support/LimitedEnumeration.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/LimitedEnumeration.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  LimitedEnumeration.java / Freenet
-  Copyright (C) tavin
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Enumeration;

Modified: trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
===================================================================
--- trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  LimitedRangeIntByteArrayMap.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.HashMap;

Modified: 
trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMapElement.java
===================================================================
--- trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMapElement.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMapElement.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  LimitedRangeIntByteArrayMapElement.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import freenet.node.AsyncMessageCallback;

Modified: trunk/freenet/src/freenet/support/Loader.java
===================================================================
--- trunk/freenet/src/freenet/support/Loader.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/Loader.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,3 @@
-/*
-  Loader.java / Freenet
-  Copyright (C) Brandon Wiley <blanu at uts.cc.utexas.edu
-  Copyright (C) oscar
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

Modified: trunk/freenet/src/freenet/support/Logger.java
===================================================================
--- trunk/freenet/src/freenet/support/Logger.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/Logger.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Logger.java / Freenet
-  Copyright (C) Iakin
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import freenet.support.LoggerHook.InvalidThresholdException;

Modified: trunk/freenet/src/freenet/support/LoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/LoggerHook.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/LoggerHook.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  LoggerHook.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.StringTokenizer;

Modified: trunk/freenet/src/freenet/support/LoggerHookChain.java
===================================================================
--- trunk/freenet/src/freenet/support/LoggerHookChain.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/LoggerHookChain.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  LoggerHookChain.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 /**

Modified: trunk/freenet/src/freenet/support/MultiValueTable.java
===================================================================
--- trunk/freenet/src/freenet/support/MultiValueTable.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/MultiValueTable.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  MultiValueTable.java / Freenet
-  Copyright (C) oskar
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;
 import java.util.*;
 /**

Modified: trunk/freenet/src/freenet/support/NumberedItem.java
===================================================================
--- trunk/freenet/src/freenet/support/NumberedItem.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/NumberedItem.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  NumberedItem.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 /**

Modified: trunk/freenet/src/freenet/support/NumberedItemComparator.java
===================================================================
--- trunk/freenet/src/freenet/support/NumberedItemComparator.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/NumberedItemComparator.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  NumberedItemComparator.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Comparator;

Modified: trunk/freenet/src/freenet/support/NumberedRecentItems.java
===================================================================
--- trunk/freenet/src/freenet/support/NumberedRecentItems.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/NumberedRecentItems.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  NumberedRecentItems.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Arrays;

Modified: trunk/freenet/src/freenet/support/OutputStreamLogger.java
===================================================================
--- trunk/freenet/src/freenet/support/OutputStreamLogger.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/OutputStreamLogger.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  OutputStreamLogger.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.io.OutputStream;

Modified: trunk/freenet/src/freenet/support/PromiscuousItemException.java
===================================================================
--- trunk/freenet/src/freenet/support/PromiscuousItemException.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/PromiscuousItemException.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  PromiscuousItemException.java / Freenet
-  Copyright (C) tavin
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import freenet.support.DoublyLinkedList.Item;

Modified: trunk/freenet/src/freenet/support/RandomGrabArray.java
===================================================================
--- trunk/freenet/src/freenet/support/RandomGrabArray.java      2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/RandomGrabArray.java      2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  RandomGrabArray.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.HashSet;

Modified: trunk/freenet/src/freenet/support/RandomGrabArrayItem.java
===================================================================
--- trunk/freenet/src/freenet/support/RandomGrabArrayItem.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/RandomGrabArrayItem.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  RandomGrabArrayItem.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 public interface RandomGrabArrayItem {

Modified: trunk/freenet/src/freenet/support/RandomGrabArrayWithClient.java
===================================================================
--- trunk/freenet/src/freenet/support/RandomGrabArrayWithClient.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/RandomGrabArrayWithClient.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  RandomGrabArrayWithClient.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import freenet.crypt.RandomSource;

Modified: trunk/freenet/src/freenet/support/RandomGrabArrayWithInt.java
===================================================================
--- trunk/freenet/src/freenet/support/RandomGrabArrayWithInt.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/RandomGrabArrayWithInt.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  RandomGrabArrayWithInt.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import freenet.crypt.RandomSource;

Modified: trunk/freenet/src/freenet/support/ReceivedPacketNumbers.java
===================================================================
--- trunk/freenet/src/freenet/support/ReceivedPacketNumbers.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/ReceivedPacketNumbers.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  ReceivedPacketNumbers.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Iterator;

Modified: trunk/freenet/src/freenet/support/RemoveRandom.java
===================================================================
--- trunk/freenet/src/freenet/support/RemoveRandom.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/RemoveRandom.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  RemoveRandom.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 public interface RemoveRandom {

Modified: trunk/freenet/src/freenet/support/RemoveRandomWithClient.java
===================================================================
--- trunk/freenet/src/freenet/support/RemoveRandomWithClient.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/RemoveRandomWithClient.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  RemoveRandomWithClient.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 public interface RemoveRandomWithClient extends RemoveRandom {

Modified: trunk/freenet/src/freenet/support/SectoredRandomGrabArray.java
===================================================================
--- trunk/freenet/src/freenet/support/SectoredRandomGrabArray.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/SectoredRandomGrabArray.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SectoredRandomGrabArray.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.HashMap;

Modified: 
trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithClient.java
===================================================================
--- trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithClient.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithClient.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SectoredRandomGrabArrayWithClient.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import freenet.crypt.RandomSource;

Modified: trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithInt.java
===================================================================
--- trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithInt.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithInt.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SectoredRandomGrabArrayWithInt.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import freenet.crypt.RandomSource;

Modified: trunk/freenet/src/freenet/support/Serializer.java
===================================================================
--- trunk/freenet/src/freenet/support/Serializer.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/Serializer.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,20 +1,20 @@
 /*
-  Serializer.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
+Dijjer - A Peer to Peer HTTP Cache
+Copyright (C) 2004,2005  Change.Tv, Inc

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.

-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

 package freenet.support;

Modified: trunk/freenet/src/freenet/support/ShortBuffer.java
===================================================================
--- trunk/freenet/src/freenet/support/ShortBuffer.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/ShortBuffer.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,22 @@
 /*
-  ShortBuffer.java / Freenet, Dijjer - A Peer to Peer HTTP Cache
-  Copyright (C) 2004,2005 Change.Tv, Inc
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
+ * Dijjer - A Peer to Peer HTTP Cache
+ * Copyright (C) 2004,2005 Change.Tv, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.io.*;

Modified: trunk/freenet/src/freenet/support/SimpleFieldSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleFieldSet.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/SimpleFieldSet.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SimpleFieldSet.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.io.BufferedInputStream;

Modified: trunk/freenet/src/freenet/support/SimpleIntNumberedItemComparator.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleIntNumberedItemComparator.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/SimpleIntNumberedItemComparator.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SimpleIntNumberedItemComparator.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Comparator;

Modified: trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SimpleReadOnlyArrayBucket.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.io.ByteArrayInputStream;

Modified: trunk/freenet/src/freenet/support/SizeUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/SizeUtil.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/SizeUtil.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SizeUtil.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 /**

Modified: trunk/freenet/src/freenet/support/SortedLongSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SortedLongSet.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/SortedLongSet.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SortedLongSet.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Arrays;

Modified: trunk/freenet/src/freenet/support/SortedVectorByNumber.java
===================================================================
--- trunk/freenet/src/freenet/support/SortedVectorByNumber.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/SortedVectorByNumber.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SortedVectorByNumber.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Arrays;

Modified: trunk/freenet/src/freenet/support/TokenBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/TokenBucket.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/TokenBucket.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  TokenBucket.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 /**

Modified: trunk/freenet/src/freenet/support/URIPreEncoder.java
===================================================================
--- trunk/freenet/src/freenet/support/URIPreEncoder.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/URIPreEncoder.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  URIPreEncoder.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.io.UnsupportedEncodingException;

Modified: trunk/freenet/src/freenet/support/URLDecoder.java
===================================================================
--- trunk/freenet/src/freenet/support/URLDecoder.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/URLDecoder.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,27 +1,15 @@
-/*
-  URLDecoder.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

+/*
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
+*/
+
+
 /**
  * The class contains a utility method for converting a 
  * <code>String</code> out of a MIME format called 

Modified: trunk/freenet/src/freenet/support/URLEncodedFormatException.java
===================================================================
--- trunk/freenet/src/freenet/support/URLEncodedFormatException.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/URLEncodedFormatException.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,25 +1,12 @@
-/*
-  URLEncodedFormat.java / Freenet, Java Adaptive Network Client
-  Copyright (C) Ian Clarke
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
+package freenet.support;

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/*
+  This code is part of the Java Adaptive Network Client by Ian Clarke. 
+  It is distributed under the GNU Public Licence (GPL) version 2.  See
+  http://www.gnu.org/ for further details of the GPL.
 */

-package freenet.support;

-
 /**
  * Thrown when trying to decode a string which is not in 
  * "<code>x-www-form-urlencoded</code>" format.

Modified: trunk/freenet/src/freenet/support/URLEncoder.java
===================================================================
--- trunk/freenet/src/freenet/support/URLEncoder.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/URLEncoder.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  URLEncoder.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 public class URLEncoder {

Modified: trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java
===================================================================
--- trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  UpdatableSortedLinkedList.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.Enumeration;

Modified: trunk/freenet/src/freenet/support/UpdatableSortedLinkedListItem.java
===================================================================
--- trunk/freenet/src/freenet/support/UpdatableSortedLinkedListItem.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/UpdatableSortedLinkedListItem.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  UpdatableSortedLinkedListItem.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import freenet.support.DoublyLinkedList.Item;

Modified: 
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListItemImpl.java
===================================================================
--- trunk/freenet/src/freenet/support/UpdatableSortedLinkedListItemImpl.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/UpdatableSortedLinkedListItemImpl.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  UpdatableSortedLinkedListItemImpl.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import freenet.support.DoublyLinkedList.Item;

Modified: 
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListKilledException.java
===================================================================
--- 
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListKilledException.java 
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListKilledException.java 
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  UpdatableSortedLinkedListKilledException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 public class UpdatableSortedLinkedListKilledException extends Exception {

Modified: 
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListWithForeignIndex.java
===================================================================
--- 
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListWithForeignIndex.java
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListWithForeignIndex.java
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  UpdatableSortedLinkedListWithForeignIndex.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import java.util.HashMap;

Modified: trunk/freenet/src/freenet/support/VirginItemException.java
===================================================================
--- trunk/freenet/src/freenet/support/VirginItemException.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/VirginItemException.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  VirginItemException.java / Freenet
-  Copyright (C) tavin
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 /**

Modified: trunk/freenet/src/freenet/support/VoidLogger.java
===================================================================
--- trunk/freenet/src/freenet/support/VoidLogger.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/VoidLogger.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,23 +1,6 @@
 /*
-  VoidLogger.java / Freenet, Java Adaptive Network Client
-  Created on Mar 18, 2004
-  Copyright (C) 2004 Iakin
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+ * Created on Mar 18, 2004
+ */
 package freenet.support;

 /**

Modified: trunk/freenet/src/freenet/support/WouldBlockException.java
===================================================================
--- trunk/freenet/src/freenet/support/WouldBlockException.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/WouldBlockException.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  WouldBlockException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support;

 import freenet.io.comm.LowLevelFilterException;

Modified: 
trunk/freenet/src/freenet/support/compress/CompressionOutputSizeException.java
===================================================================
--- 
trunk/freenet/src/freenet/support/compress/CompressionOutputSizeException.java  
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/support/compress/CompressionOutputSizeException.java  
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  CompressionOutputSizeException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.compress;

 /**

Modified: trunk/freenet/src/freenet/support/compress/Compressor.java
===================================================================
--- trunk/freenet/src/freenet/support/compress/Compressor.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/compress/Compressor.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  Compressor.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.compress;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/support/compress/DecompressException.java
===================================================================
--- trunk/freenet/src/freenet/support/compress/DecompressException.java 
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/compress/DecompressException.java 
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  DecompressException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.compress;

 /**

Modified: trunk/freenet/src/freenet/support/compress/GzipCompressor.java
===================================================================
--- trunk/freenet/src/freenet/support/compress/GzipCompressor.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/compress/GzipCompressor.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  GzipCompressor.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.compress;

 import java.io.ByteArrayInputStream;

Modified: trunk/freenet/src/freenet/support/io/ArrayBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/ArrayBucket.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/ArrayBucket.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Array Bucket.java / Freenet
-  Copyright (C) oskar
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.ByteArrayInputStream;

Modified: trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java        
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/ArrayBucketFactory.java        
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  ArrayBucketFactory.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/support/io/Bucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/Bucket.java    2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/io/Bucket.java    2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  Bucket.java / Freenet
-  Copyright (C) oskar
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;
 import java.io.*;
 /**

Modified: trunk/freenet/src/freenet/support/io/BucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketFactory.java     2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/BucketFactory.java     2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  BucketFactory.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/support/io/BucketTools.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketTools.java       2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/BucketTools.java       2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  BucketTools.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.DataInputStream;

Modified: 
trunk/freenet/src/freenet/support/io/CannotCreateFromFieldSetException.java
===================================================================
--- trunk/freenet/src/freenet/support/io/CannotCreateFromFieldSetException.java 
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/CannotCreateFromFieldSetException.java 
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  CannotCreateFromFieldSetException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 public class CannotCreateFromFieldSetException extends Exception {

Modified: trunk/freenet/src/freenet/support/io/FileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/FileBucket.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/FileBucket.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  FileBucket.java / Freenet
-  Copyright (C) oskar
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.File;

Modified: trunk/freenet/src/freenet/support/io/FileBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/FileBucketFactory.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/FileBucketFactory.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  FileBucketFactory.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.File;

Modified: trunk/freenet/src/freenet/support/io/FileUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/io/FileUtil.java  2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/support/io/FileUtil.java  2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  FileUtil.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.File;

Modified: trunk/freenet/src/freenet/support/io/FilenameGenerator.java
===================================================================
--- trunk/freenet/src/freenet/support/io/FilenameGenerator.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/FilenameGenerator.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  FilenameGenerator.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.File;

Modified: trunk/freenet/src/freenet/support/io/LineReader.java
===================================================================
--- trunk/freenet/src/freenet/support/io/LineReader.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/LineReader.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  LineReader.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/support/io/LineReadingInputStream.java
===================================================================
--- trunk/freenet/src/freenet/support/io/LineReadingInputStream.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/LineReadingInputStream.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  LineReadingInputStream.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.FilterInputStream;

Modified: trunk/freenet/src/freenet/support/io/NullBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/NullBucket.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/NullBucket.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  NullBucket.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;
 import java.io.InputStream;
 import java.io.OutputStream;

Modified: trunk/freenet/src/freenet/support/io/NullInputStream.java
===================================================================
--- trunk/freenet/src/freenet/support/io/NullInputStream.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/NullInputStream.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  NullInputStream.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;
 import java.io.*;


Modified: trunk/freenet/src/freenet/support/io/NullOutputStream.java
===================================================================
--- trunk/freenet/src/freenet/support/io/NullOutputStream.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/NullOutputStream.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  NullOutputStream.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;
 import java.io.*;


Modified: trunk/freenet/src/freenet/support/io/NullPersistentFileTracker.java
===================================================================
--- trunk/freenet/src/freenet/support/io/NullPersistentFileTracker.java 
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/NullPersistentFileTracker.java 
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  NullPersistenFileTracker.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.File;

Modified: trunk/freenet/src/freenet/support/io/NullWriter.java
===================================================================
--- trunk/freenet/src/freenet/support/io/NullWriter.java        2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/NullWriter.java        2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  NullWriter.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.IOException;

Modified: 
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PaddedEphemerallyEncryptedBucket.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.IOException;

Modified: 
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucketFactory.java
===================================================================
--- 
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucketFactory.java
   2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucketFactory.java
   2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PaddedEphemerallyEncryptedBucketFactory.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.IOException;

Modified: 
trunk/freenet/src/freenet/support/io/PersistentEncryptedTempBucketFactory.java
===================================================================
--- 
trunk/freenet/src/freenet/support/io/PersistentEncryptedTempBucketFactory.java  
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/support/io/PersistentEncryptedTempBucketFactory.java  
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PersistentEncryptedTempBucketFactory.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/support/io/PersistentFileTracker.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PersistentFileTracker.java     
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/PersistentFileTracker.java     
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PersistenFileTracker.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.File;

Modified: trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java       
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java       
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PersistentTempBucketFactory.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.File;

Modified: trunk/freenet/src/freenet/support/io/RandomAccessFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/RandomAccessFileBucket.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/RandomAccessFileBucket.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  RandomAccessFileBucket.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-
-
 // REDFLAG: test and javadoc
 package freenet.support.io;


Modified: trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java   
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java   
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  ReadOnlyFileSliceBucket.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.EOFException;

Modified: trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucket.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucket.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SerializableToFieldSetBucket.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import freenet.support.SimpleFieldSet;

Modified: 
trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java  
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java  
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  SerializableToFieldSetBucketUtil.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import freenet.crypt.RandomSource;

Modified: trunk/freenet/src/freenet/support/io/SpyInputStream.java
===================================================================
--- trunk/freenet/src/freenet/support/io/SpyInputStream.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/SpyInputStream.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,26 +1,14 @@
-/*
-  SpyInputStream.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.IOException;
 import java.io.InputStream;

+/*
+ * This code is part of FProxy, an HTTP proxy server for Freenet. It is
+ * distributed under the GNU Public Licence (GPL) version 2. See
+ * http://www.gnu.org/ for further details of the GPL.
+ */
+
 /**
  * The purpose of all of this gobbledeygook is to keep rude FCPClient
  * implementations from writing to temp files after the requests that own them

Modified: trunk/freenet/src/freenet/support/io/SpyOutputStream.java
===================================================================
--- trunk/freenet/src/freenet/support/io/SpyOutputStream.java   2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/SpyOutputStream.java   2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SpyOUtputStream.java / Freenet
-  Copyright (C) ian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.FilterOutputStream;
@@ -25,6 +6,12 @@

 import freenet.support.Logger;

+/*
+ * This code is part of FProxy, an HTTP proxy server for Freenet. It is
+ * distributed under the GNU Public Licence (GPL) version 2. See
+ * http://www.gnu.org/ for further details of the GPL.
+ */
+
 /**
  * @author ian
  * @see freenet.support.SpyInputStream

Modified: trunk/freenet/src/freenet/support/io/TempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  TempBucketFactory.java / Freenet
-  Copyright (C) giannij
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.File;
@@ -24,6 +5,12 @@

 import freenet.support.Logger;

+/*
+ * This code is part of FProxy, an HTTP proxy server for Freenet. It is
+ * distributed under the GNU Public Licence (GPL) version 2. See
+ * http://www.gnu.org/ for further details of the GPL.
+ */
+
 /**
  * Temporary Bucket Factory
  * 

Modified: trunk/freenet/src/freenet/support/io/TempBucketHook.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempBucketHook.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/TempBucketHook.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  TempBucketHook.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.IOException;

Modified: trunk/freenet/src/freenet/support/io/TempFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempFileBucket.java    2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/TempFileBucket.java    2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  TempFileBucket.java / Freenet
-  Copyright (C) giannij
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.File;
@@ -28,6 +9,11 @@
 import freenet.support.Logger;
 import freenet.support.SimpleFieldSet;

+/*
+ *  This code is part of FProxy, an HTTP proxy server for Freenet.
+ *  It is distributed under the GNU Public Licence (GPL) version 2.  See
+ *  http://www.gnu.org/ for further details of the GPL.
+ */
 /**
  * Temporary file handling. TempFileBuckets start empty.
  *

Modified: trunk/freenet/src/freenet/support/io/TooLongException.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TooLongException.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/io/TooLongException.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  TooLongException.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.io;

 import java.io.IOException;

Modified: 
trunk/freenet/src/freenet/support/math/BootstrappingDecayingRunningAverage.java
===================================================================
--- 
trunk/freenet/src/freenet/support/math/BootstrappingDecayingRunningAverage.java 
    2006-09-19 22:06:34 UTC (rev 10489)
+++ 
trunk/freenet/src/freenet/support/math/BootstrappingDecayingRunningAverage.java 
    2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  BootstrappingDecayingRunningAverage.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.math;

 import java.io.DataInputStream;

Modified: trunk/freenet/src/freenet/support/math/RunningAverage.java
===================================================================
--- trunk/freenet/src/freenet/support/math/RunningAverage.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/math/RunningAverage.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  RunningAverage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.math;

 import java.io.Serializable;

Modified: trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
===================================================================
--- trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,23 +1,3 @@
-/*
-  SimpleBinaryRunningAverage.java / Freenet
-  Created on May 14, 2004
-  Copyright (C) 2004 amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.math;

 import java.io.DataInputStream;

Modified: trunk/freenet/src/freenet/support/math/SimpleRunningAverage.java
===================================================================
--- trunk/freenet/src/freenet/support/math/SimpleRunningAverage.java    
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/math/SimpleRunningAverage.java    
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,22 +1,3 @@
-/*
-  SimpleRunningAverage.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.math;

 import java.io.DataOutputStream;

Modified: trunk/freenet/src/freenet/support/math/TimeDecayingRunningAverage.java
===================================================================
--- trunk/freenet/src/freenet/support/math/TimeDecayingRunningAverage.java      
2006-09-19 22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/support/math/TimeDecayingRunningAverage.java      
2006-09-20 00:07:46 UTC (rev 10490)
@@ -1,21 +1,3 @@
-/*
-  TimeDecayingRunningAverage.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.support.math;

 import java.io.DataInputStream;

Modified: trunk/freenet/src/freenet/tools/AddRef.java
===================================================================
--- trunk/freenet/src/freenet/tools/AddRef.java 2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/freenet/tools/AddRef.java 2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,21 +1,3 @@
-/*
-  AddRef.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.tools;

 import java.io.File;

Modified: trunk/freenet/src/freenet/transport/IPAddressDetector.java
===================================================================
--- trunk/freenet/src/freenet/transport/IPAddressDetector.java  2006-09-19 
22:06:34 UTC (rev 10489)
+++ trunk/freenet/src/freenet/transport/IPAddressDetector.java  2006-09-20 
00:07:46 UTC (rev 10490)
@@ -1,21 +1,4 @@
-/*
-  IPAddressDetector.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
+/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
 package freenet.transport;

 import java.net.DatagramSocket;

Modified: trunk/freenet/src/freenet/transport/IPUtil.java
===================================================================
--- trunk/freenet/src/freenet/transport/IPUtil.java     2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/freenet/transport/IPUtil.java     2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  IPUtil.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.transport;

 import java.net.InetAddress;

Modified: trunk/freenet/src/test/AddressIdentifierTest.java
===================================================================
--- trunk/freenet/src/test/AddressIdentifierTest.java   2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/test/AddressIdentifierTest.java   2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,19 @@
 /*
-  AddressIdentifierTest.java / Freenet
-  Copyright (C) 2006 David Roden <droden at gmail.com>
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package test;

 import junit.framework.TestCase;

Modified: trunk/freenet/src/test/DatastoreTest.java
===================================================================
--- trunk/freenet/src/test/DatastoreTest.java   2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/test/DatastoreTest.java   2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,21 +1,3 @@
-/*
-  DatastoreTest.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package test;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/test/Inet4AddressMatcherTest.java
===================================================================
--- trunk/freenet/src/test/Inet4AddressMatcherTest.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/test/Inet4AddressMatcherTest.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,19 @@
 /*
-  Inet4AddressMatcherTest.java / Freenet
-  Copyright (C) 2006 David Roden <droden at gmail.com>
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package freenet.io;

 import java.net.Inet4Address;

Modified: trunk/freenet/src/test/Inet6AddressMatcherTest.java
===================================================================
--- trunk/freenet/src/test/Inet6AddressMatcherTest.java 2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/test/Inet6AddressMatcherTest.java 2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,22 @@
 /*
-  Inet6AddressMatcherTest.java / Freenet
-  Copyright (C) 2006 David Roden <droden at gmail.com>
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
+ * freenet0.7 - 
+ * Copyright (C) 2006 David Roden
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package test;

 import java.net.InetAddress;

Modified: trunk/freenet/src/test/PaddingSpeedTest.java
===================================================================
--- trunk/freenet/src/test/PaddingSpeedTest.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/test/PaddingSpeedTest.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PaddingSpeedTest.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package test;

 import java.security.DigestException;

Modified: trunk/freenet/src/test/PingTest.java
===================================================================
--- trunk/freenet/src/test/PingTest.java        2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/test/PingTest.java        2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,22 +1,3 @@
-/*
-  PingTest.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package test;

 import java.net.InetAddress;
@@ -43,6 +24,7 @@


     /**
+     * @author root
      *
      * TODO To change the template for this generated type comment go to
      * Window - Preferences - Java - Code Generation - Code and Comments

Modified: trunk/freenet/src/test/PreNodeTest.java
===================================================================
--- trunk/freenet/src/test/PreNodeTest.java     2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/test/PreNodeTest.java     2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,21 +1,3 @@
-/*
-  PreNodeTest.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package test;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/test/PreQuasiNodeTest.java
===================================================================
--- trunk/freenet/src/test/PreQuasiNodeTest.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/test/PreQuasiNodeTest.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,21 +1,3 @@
-/*
-  PreQuasiNodeTest.java / Freenet
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package test;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/test/QuasiNodeTest.java
===================================================================
--- trunk/freenet/src/test/QuasiNodeTest.java   2006-09-19 22:06:34 UTC (rev 
10489)
+++ trunk/freenet/src/test/QuasiNodeTest.java   2006-09-20 00:07:46 UTC (rev 
10490)
@@ -1,22 +1,3 @@
-/*
-  QuasiNodeTest.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package test;

 import java.io.BufferedReader;

Modified: trunk/freenet/src/test/TransferBlockTest.java
===================================================================
--- trunk/freenet/src/test/TransferBlockTest.java       2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/test/TransferBlockTest.java       2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  TransferBlockTest.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package test;

 import java.io.BufferedReader;
@@ -60,6 +41,7 @@


     /**
+     * @author root
      *
      * TODO To change the template for this generated type comment go to
      * Window - Preferences - Java - Code Generation - Code and Comments

Modified: trunk/freenet/src/test/TransferSendTest.java
===================================================================
--- trunk/freenet/src/test/TransferSendTest.java        2006-09-19 22:06:34 UTC 
(rev 10489)
+++ trunk/freenet/src/test/TransferSendTest.java        2006-09-20 00:07:46 UTC 
(rev 10490)
@@ -1,22 +1,3 @@
-/*
-  TransferSendTest.java / Freenet
-  Copyright (C) amphibian
-  Copyright (C) 2005-2006 The Free Network project
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
 package test;

 import java.net.InetAddress;
@@ -52,6 +33,7 @@


     /**
+     * @author root
      *
      * TODO To change the template for this generated type comment go to
      * Window - Preferences - Java - Code Generation - Code and Comments

Reply via email to