[GNUnet-SVN] r21385 - gnunet-java/src/org/gnunet/dht

[gnunet]

Author: dold
Date: 2012-05-09 16:15:43 +0200 (Wed, 09 May 2012)
New Revision: 21385

Added:
   gnunet-java/src/org/gnunet/dht/MonitorGetHandler.java
   gnunet-java/src/org/gnunet/dht/MonitorGetResponseHandler.java
   gnunet-java/src/org/gnunet/dht/MonitorPutHandler.java
Modified:
   gnunet-java/src/org/gnunet/dht/DistributedHashTable.java
Log:
fix/refactoring

Modified: gnunet-java/src/org/gnunet/dht/DistributedHashTable.java
===================================================================
--- gnunet-java/src/org/gnunet/dht/DistributedHashTable.java    2012-05-09 
14:13:11 UTC (rev 21384)
+++ gnunet-java/src/org/gnunet/dht/DistributedHashTable.java    2012-05-09 
14:15:43 UTC (rev 21385)
@@ -115,18 +115,6 @@
         }
     }
 
-    public interface MonitorGetHandler {
-        void onGet(int options, int type, int hop_count, int 
desired_replication_level, PeerIdentity[] getPath,
-                   HashCode key);
-    }
-
-    public interface MonitorGetResponseHandler {}
-
-    public interface MonitorPutHandler {
-        void onPut(int options, int type, int hop_count, AbsoluteTimeMessage 
expirationTime, PeerIdentity[] putPath,
-                   HashCode key, byte[] data);
-    }
-
     private class MonitorRequest extends RequestQueue.Request {
 
         public int blockType;
@@ -199,6 +187,13 @@
                 logger.warn("monitor service confused in monitoring");
                 return;
             }
+            currentMonitorRequest.getResponseHandler.onGetResponse(
+                    monitorGetRespMessage.type,
+                    monitorGetRespMessage.getPath,
+                    monitorGetRespMessage.putPath,
+                    monitorGetRespMessage.expiration,
+                    monitorGetRespMessage.key,
+                    monitorGetRespMessage.data);
         }
 
         public void visit(MonitorPutMessage monitorPutMessage) {
@@ -397,7 +392,13 @@
                                     System.out.println("get monitored");
                                 }
                             },
-                            new MonitorGetResponseHandler() {},
+                            new MonitorGetResponseHandler() {
+                                @Override
+                                public void onGetResponse(int type, 
PeerIdentity[] getPath, PeerIdentity[] putPath,
+                                                          AbsoluteTimeMessage 
expiration, HashCode key, byte[] data) {
+                                    System.out.println("get response 
monitored");
+                                }
+                            },
                             new MonitorPutHandler() {
                                 @Override
                                 public void onPut(int options, int type, int 
hop_count, AbsoluteTimeMessage

Added: gnunet-java/src/org/gnunet/dht/MonitorGetHandler.java
===================================================================
--- gnunet-java/src/org/gnunet/dht/MonitorGetHandler.java                       
        (rev 0)
+++ gnunet-java/src/org/gnunet/dht/MonitorGetHandler.java       2012-05-09 
14:15:43 UTC (rev 21385)
@@ -0,0 +1,10 @@
+package org.gnunet.dht;
+
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+
+public interface MonitorGetHandler {
+    void onGet(int options, int type, int hop_count, int 
desired_replication_level, PeerIdentity[] getPath,
+               HashCode key);
+}

Added: gnunet-java/src/org/gnunet/dht/MonitorGetResponseHandler.java
===================================================================
--- gnunet-java/src/org/gnunet/dht/MonitorGetResponseHandler.java               
                (rev 0)
+++ gnunet-java/src/org/gnunet/dht/MonitorGetResponseHandler.java       
2012-05-09 14:15:43 UTC (rev 21385)
@@ -0,0 +1,11 @@
+package org.gnunet.dht;
+
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+
+public interface MonitorGetResponseHandler {
+    void onGetResponse(int type, PeerIdentity[] getPath, PeerIdentity[] 
putPath, AbsoluteTimeMessage expiration,
+                       HashCode key, byte[] data);
+}

Added: gnunet-java/src/org/gnunet/dht/MonitorPutHandler.java
===================================================================
--- gnunet-java/src/org/gnunet/dht/MonitorPutHandler.java                       
        (rev 0)
+++ gnunet-java/src/org/gnunet/dht/MonitorPutHandler.java       2012-05-09 
14:15:43 UTC (rev 21385)
@@ -0,0 +1,11 @@
+package org.gnunet.dht;
+
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+
+public interface MonitorPutHandler {
+    void onPut(int options, int type, int hop_count, AbsoluteTimeMessage 
expirationTime, PeerIdentity[] putPath,
+               HashCode key, byte[] data);
+}