[freenet-cvs] r16888 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-01-04 19:28:22 +0000 (Fri, 04 Jan 2008)
New Revision: 16888

Added:
   trunk/freenet/src/freenet/node/GetPubkey.java
Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
Extract GetPubkey interface from Node.

Added: trunk/freenet/src/freenet/node/GetPubkey.java
===================================================================
--- trunk/freenet/src/freenet/node/GetPubkey.java                               
(rev 0)
+++ trunk/freenet/src/freenet/node/GetPubkey.java       2008-01-04 19:28:22 UTC 
(rev 16888)
@@ -0,0 +1,12 @@
+package freenet.node;
+
+import freenet.crypt.DSAPublicKey;
+
+public interface GetPubkey {
+
+       /**
+        * Look up a cached public key by its hash.
+        */
+       public abstract DSAPublicKey getKey(byte[] hash);
+
+}
\ No newline at end of file

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2008-01-04 19:25:11 UTC (rev 
16887)
+++ trunk/freenet/src/freenet/node/Node.java    2008-01-04 19:28:22 UTC (rev 
16888)
@@ -115,7 +115,7 @@
 /**
  * @author amphibian
  */
-public class Node implements TimeSkewDetectorCallback {
+public class Node implements TimeSkewDetectorCallback, GetPubkey {

        private static boolean logMINOR;

@@ -124,9 +124,9 @@
        private static TimeSkewDetectedUserAlert timeSkewDetectedUserAlert;

        public class NodeNameCallback implements StringCallback{
-                       Node node;
+                       GetPubkey node;

-                       NodeNameCallback(Node n) {
+                       NodeNameCallback(GetPubkey n) {
                                node=n;
                        }
                        public String get() {
@@ -2301,8 +2301,8 @@
          }
        }

-       /**
-        * Look up a cached public key by its hash.
+       /* (non-Javadoc)
+        * @see freenet.node.GetPubkey#getKey(byte[])
         */
        public DSAPublicKey getKey(byte[] hash) {
                ImmutableByteArrayWrapper w = new 
ImmutableByteArrayWrapper(hash);