Author: toad
Date: 2005-10-26 20:46:40 +0000 (Wed, 26 Oct 2005)
New Revision: 7456
Removed:
trunk/freenet/src/freenet/keys/ClientBlock.java
Modified:
trunk/freenet/src/freenet/client/ArchiveManager.java
trunk/freenet/src/freenet/keys/ClientKey.java
trunk/freenet/src/freenet/keys/FreenetURI.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/SimpleLowLevelClient.java
Log:
Minor changes.
Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java 2005-10-26
19:45:40 UTC (rev 7455)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java 2005-10-26
20:46:40 UTC (rev 7456)
@@ -4,8 +4,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.LinkedHashMap;
-import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -13,7 +11,6 @@
import freenet.crypt.RandomSource;
import freenet.crypt.UnsupportedCipherException;
import freenet.crypt.ciphers.Rijndael;
-import freenet.keys.ClientKey;
import freenet.keys.FreenetURI;
import freenet.support.Bucket;
import freenet.support.HexUtil;
Deleted: trunk/freenet/src/freenet/keys/ClientBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientBlock.java 2005-10-26 19:45:40 UTC
(rev 7455)
+++ trunk/freenet/src/freenet/keys/ClientBlock.java 2005-10-26 20:46:40 UTC
(rev 7456)
@@ -1,5 +0,0 @@
-package freenet.keys;
-
-public class ClientBlock {
-
-}
Modified: trunk/freenet/src/freenet/keys/ClientKey.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientKey.java 2005-10-26 19:45:40 UTC
(rev 7455)
+++ trunk/freenet/src/freenet/keys/ClientKey.java 2005-10-26 20:46:40 UTC
(rev 7456)
@@ -1,7 +1,5 @@
package freenet.keys;
-import freenet.client.ArchiveHandler;
-
/**
* Base class for client keys.
* Client keys are decodable. Node keys are not.
Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java 2005-10-26 19:45:40 UTC
(rev 7455)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java 2005-10-26 20:46:40 UTC
(rev 7456)
@@ -257,13 +257,14 @@
* Returns a copy of this URI with the given string added as a new meta
string.
*/
public FreenetURI pushMetaString(String name) {
+ String[] newMetaStr;
if(metaStr == null)
- metaStr = new String[] { name };
+ newMetaStr = new String[] { name };
else {
- String[] newMetaStr = new String[metaStr.length+1];
+ newMetaStr = new String[metaStr.length+1];
System.arraycopy(metaStr, 0, newMetaStr, 0,
metaStr.length);
- return setMetaString(newMetaStr);
}
+ return setMetaString(newMetaStr);
}
/**
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2005-10-26 19:45:40 UTC (rev
7455)
+++ trunk/freenet/src/freenet/node/Node.java 2005-10-26 20:46:40 UTC (rev
7456)
@@ -31,7 +31,6 @@
import freenet.io.comm.DisconnectedException;
import freenet.io.comm.Message;
import freenet.io.comm.MessageFilter;
-import freenet.io.comm.NotConnectedException;
import freenet.io.comm.Peer;
import freenet.io.comm.PeerParseException;
import freenet.io.comm.UdpSocketManager;
@@ -40,7 +39,8 @@
import freenet.keys.CHKVerifyException;
import freenet.keys.ClientCHK;
import freenet.keys.ClientCHKBlock;
-import freenet.keys.ClientPublishStreamKey;
+import freenet.keys.ClientKey;
+import freenet.keys.KeyBlock;
import freenet.keys.NodeCHK;
import freenet.store.BaseFreenetStore;
import freenet.store.FreenetStore;
@@ -305,6 +305,13 @@
usm.start();
}
+ public KeyBlock getKey(ClientKey key) {
+ if(key instanceof ClientCHK)
+ return getCHK((ClientCHK)key);
+ else
+ throw new IllegalArgumentException();
+ }
+
/**
* Really trivially simple client interface.
* Either it succeeds or it doesn't.
Modified: trunk/freenet/src/freenet/node/SimpleLowLevelClient.java
===================================================================
--- trunk/freenet/src/freenet/node/SimpleLowLevelClient.java 2005-10-26
19:45:40 UTC (rev 7455)
+++ trunk/freenet/src/freenet/node/SimpleLowLevelClient.java 2005-10-26
20:46:40 UTC (rev 7456)
@@ -1,10 +1,7 @@
package freenet.node;
-import freenet.keys.ClientBlock;
-import freenet.keys.ClientCHK;
import freenet.keys.ClientCHKBlock;
import freenet.keys.ClientKey;
-import freenet.keys.ClientPublishStreamKey;
import freenet.keys.KeyBlock;
/**
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
