From 41c5c62dc668d4de07c66b839aba8db095291e06 Mon Sep 17 00:00:00 2001
From: Denis <denis@denis-Rev-1-0.(none)>
Date: Sat, 9 Feb 2013 18:48:48 +0100
Subject: [PATCH] FileIdentifier class isnt really needed, fixed it. It has to
 be deleted, dont know how to do it atm :)

---
 ws2012/P2P/uebungen/11/src/node/Node.java       | 13 +++++++------
 ws2012/P2P/uebungen/11/src/node/UDPHandler.java |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ws2012/P2P/uebungen/11/src/node/Node.java b/ws2012/P2P/uebungen/11/src/node/Node.java
index ad654ca4..a9a53e76 100644
--- a/ws2012/P2P/uebungen/11/src/node/Node.java
+++ b/ws2012/P2P/uebungen/11/src/node/Node.java
@@ -125,7 +125,7 @@ public class Node {
         }
     }
 
-    void sendFindValue(NodeIdentifier receiver, FileIdentifier idToFind) {
+    void sendFindValue(NodeIdentifier receiver, Identifier idToFind) {
         boolean successful = send(receiver, MessageType.FIND_VALUE,
                 idToFind.getBytes(), true, null);
 
@@ -173,7 +173,7 @@ public class Node {
         }
     }
     
-    public void sendStore(NodeIdentifier receiver, FileIdentifier fileID) { 	
+    public void sendStore(NodeIdentifier receiver, Identifier fileID) { 	
     	boolean successful = send(receiver, MessageType.STORE, fileID.getBytes(), true, null);
     	
     	if (successful) {
@@ -313,13 +313,14 @@ public class Node {
         return routingTable.getEntries();
     }
     
-    public void StorePair(FileIdentifier key, NodeIdentifier id) {
-    	System.out.println("Key: " + key.getKey());
-    	System.out.println("Node: " + id.getAddress());
+    public void StorePair(Identifier key, NodeIdentifier id) {
+    	System.out.println(values.size());
+    	System.out.println(key.toString());
     	values.put(key, id);
+    	System.out.println(values.size());
     }
     
-    public boolean hasKey(FileIdentifier key) {
+    public boolean hasKey(Identifier key) {
     	return values.containsKey(key);
     }
 
diff --git a/ws2012/P2P/uebungen/11/src/node/UDPHandler.java b/ws2012/P2P/uebungen/11/src/node/UDPHandler.java
index 35168196..f3306b0c 100644
--- a/ws2012/P2P/uebungen/11/src/node/UDPHandler.java
+++ b/ws2012/P2P/uebungen/11/src/node/UDPHandler.java
@@ -218,7 +218,7 @@ public class UDPHandler implements Runnable {
     private void receiveStore(NodeIdentifier fromID, Identifier rpc_id) {
     	//TODO Cast geht an dieser stelle nicht, getIDFromBuffer() müsste man für
     	// FileID implementieren.
-    	FileIdentifier fileID = (FileIdentifier) getIDFromBuffer();
+    	Identifier fileID = getIDFromBuffer();
     	
     	node.StorePair(fileID, fromID);
     }