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

[zot...@freenetproject.org]

Author: zothar
Date: 2008-01-27 16:57:20 +0000 (Sun, 27 Jan 2008)
New Revision: 17324

Modified:
   trunk/freenet/src/freenet/node/DarknetPeerNode.java
   trunk/freenet/src/freenet/node/OpennetPeerNode.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/SeedClientPeerNode.java
   trunk/freenet/src/freenet/node/SeedServerPeerNode.java
Log:
Factor out getLocalNoderef() since it is the same in all implementations.  
Thanks to toad for the catch; I believe I missed this originally because of the 
order in which I implemented it.

Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-01-27 14:10:48 UTC 
(rev 17323)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-01-27 16:57:20 UTC 
(rev 17324)
@@ -1526,11 +1526,4 @@
                        return super.equals(o);
                } else return false;
        }
-
-       /**
-        * Return the relevant local node reference related to this peer's type
-        */
-       protected SimpleFieldSet getLocalNoderef() {
-               return crypto.exportPublicFieldSet();
-       }
 }

Modified: trunk/freenet/src/freenet/node/OpennetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetPeerNode.java 2008-01-27 14:10:48 UTC 
(rev 17323)
+++ trunk/freenet/src/freenet/node/OpennetPeerNode.java 2008-01-27 16:57:20 UTC 
(rev 17324)
@@ -96,11 +96,4 @@
                        return super.equals(o);
                } else return false;
        }
-
-       /**
-        * Return the relevant local node reference related to this peer's type
-        */
-       protected SimpleFieldSet getLocalNoderef() {
-               return crypto.exportPublicFieldSet();
-       }
 }

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-01-27 14:10:48 UTC 
(rev 17323)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-01-27 16:57:20 UTC 
(rev 17324)
@@ -3497,8 +3497,7 @@
         * Return the relevant local node reference related to this peer's type
         */
        protected SimpleFieldSet getLocalNoderef() {
-               // Do nothing in the default impl
-               return null;
+               return crypto.exportPublicFieldSet();
        }

        /**

Modified: trunk/freenet/src/freenet/node/SeedClientPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/SeedClientPeerNode.java      2008-01-27 
14:10:48 UTC (rev 17323)
+++ trunk/freenet/src/freenet/node/SeedClientPeerNode.java      2008-01-27 
16:57:20 UTC (rev 17324)
@@ -87,11 +87,4 @@
        void startARKFetcher() {
                // Do not start an ARK fetcher.
        }
-
-       /**
-        * Return the relevant local node reference related to this peer's type
-        */
-       protected SimpleFieldSet getLocalNoderef() {
-               return crypto.exportPublicFieldSet();
-       }
 }

Modified: trunk/freenet/src/freenet/node/SeedServerPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/SeedServerPeerNode.java      2008-01-27 
14:10:48 UTC (rev 17323)
+++ trunk/freenet/src/freenet/node/SeedServerPeerNode.java      2008-01-27 
16:57:20 UTC (rev 17324)
@@ -98,11 +98,4 @@
        protected boolean generateIdentityFromPubkey() {
                return false;
        }
-
-       /**
-        * Return the relevant local node reference related to this peer's type
-        */
-       protected SimpleFieldSet getLocalNoderef() {
-               return crypto.exportPublicFieldSet();
-       }
 }