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

[t...@freenetproject.org]

Author: toad
Date: 2007-09-08 16:13:13 +0000 (Sat, 08 Sep 2007)
New Revision: 15054

Modified:
   trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
   trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
Rename register/unregister methods to make them more logical

Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2007-09-08 
16:11:26 UTC (rev 15053)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2007-09-08 
16:13:13 UTC (rev 15054)
@@ -170,7 +170,7 @@
        /**
         * Register a plugin.
         */
-       public void register(FredPluginIPDetector d) {
+       public void registerDetectorPlugin(FredPluginIPDetector d) {
                if(d == null) throw new NullPointerException();
                synchronized(this) {
                        FredPluginIPDetector[] newPlugins = new 
FredPluginIPDetector[plugins.length+1];
@@ -185,7 +185,7 @@
        /**
         * Remove a plugin.
         */
-       public void remove(FredPluginIPDetector d) {
+       public void unregisterDetectorPlugin(FredPluginIPDetector d) {
                synchronized(this) {
                        int count = 0;
                        for(int i=0;i<plugins.length;i++) {
@@ -637,7 +637,7 @@
        /**
         * Remove a plugin.
         */
-       public void remove(FredPluginPortForward forward) {
+       public void unregisterPortForwardPlugin(FredPluginPortForward forward) {
                synchronized(this) {
                        int count = 0;
                        for(int i=0;i<portForwardPlugins.length;i++) {

Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java  2007-09-08 16:11:26 UTC 
(rev 15053)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java  2007-09-08 16:13:13 UTC 
(rev 15054)
@@ -411,11 +411,11 @@
        }

        public void registerIPDetectorPlugin(FredPluginIPDetector detector) {
-               ipDetectorManager.register(detector);
+               ipDetectorManager.registerDetectorPlugin(detector);
        }

        public void unregisterIPDetectorPlugin(FredPluginIPDetector detector) {
-               ipDetectorManager.remove(detector);
+               ipDetectorManager.unregisterDetectorPlugin(detector);
        }

        public synchronized boolean isDetecting() {
@@ -451,6 +451,6 @@
        }

        public void unregisterPortForwardPlugin(FredPluginPortForward forward) {
-               ipDetectorManager.remove(forward);
+               ipDetectorManager.unregisterPortForwardPlugin(forward);
        }
 }