asap hop list is now parameter of notify method - and it works.

Author: thsc42

src/net/sharksystem/asap/ASAPPeerFS.java

@@ -29,9 +29,25 @@ public void chunkReceived(String format, String senderE2E, String uri, int era,
                               List<ASAPHop> asapHopList) throws IOException {
 
         StringBuilder sb = new StringBuilder();
+        String hopListString = "hoplist == null";
+        if(asapHopList != null) {
+            int i = 0;
+            for (ASAPHop hop : asapHopList) {
+                sb.append("hop#");
+                sb.append(i++);
+                sb.append(": ");
+                sb.append(hop.toString());
+                sb.append("\n");
+            }
+            hopListString = sb.toString();
+        }
+
+        sb = new StringBuilder();
         sb.append("\n++++++++++++++++++++++++++++++++++++++++++ chunkReceived +++++++++++++++++++++++++++++++++++++++++++\n");
         sb.append("E2E|P2P: " + senderE2E +  " | " + asapHopList.get(asapHopList.size()-1).sender() + " | uri: " + uri + " | era: " + era + " | appFormat: " + format);
-        sb.append("\n++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+        sb.append("\n");
+        sb.append(hopListString);
+        sb.append("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
         this.log(sb.toString());
 
         if(this.chunkReceivedListener != null) {

src/net/sharksystem/asap/engine/ASAPEngine.java

@@ -403,11 +403,9 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimilationPDU, A
 
         // debug break
         //Log.writeLog(this, "!!!!!!!!!!!!!!!!!!!!!!!! ASSIMILATE PDU senderE2E: " + senderE2E);
-        /*
         if(PeerIDHelper.sameID(senderE2E, "Alice_42")) {
             int i = 42;
         }
-         */
 
         if(PeerIDHelper.sameID(senderE2E, this.owner)) {
             Log.writeLogErr(this,  "I was offered messages from myself ("
@@ -629,6 +627,12 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
             lastSeenEra = this.getOldestEra();
         }
 
+        /*
+        if(PeerIDHelper.sameID(encounteredPeer, "Clara_44")) {
+            int i = 42; // debug break;
+        }
+         */
+
         int workingEra = lastSeenEra;
         System.out.println(this.getLogStart() + "last_seen: " + workingEra + " | era: " + this.era);
 

src/net/sharksystem/asap/engine/ASAPInMemoMessages.java

@@ -162,7 +162,7 @@ public byte[] getMessage(int position, boolean chronologically)
         }
 
         if(this.messageCache != null && position >= this.firstIndexMessageCache && position <= this.lastIndexMessageCache) {
-            return this.messageCache.get(position - this.firstIndexMessageCache); // TODO calculation correct?
+            return this.messageCache.get(position - this.firstIndexMessageCache); 
         }
 
         // not yet in cache - find chunk with required message

src/net/sharksystem/asap/engine/ASAPInternalChunk.java

@@ -87,5 +87,5 @@ public interface ASAPInternalChunk extends ASAPChunk {
 
     List<ASAPHop> getASAPHopList();
 
-    void setASAPHopList(List<ASAPHop> asapHopList);
+    void setASAPHopList(List<ASAPHop> asapHopList) throws IOException;
 }

src/net/sharksystem/asap/engine/ASAPInternalChunkFS.java

@@ -56,8 +56,9 @@ public List<ASAPHop> getASAPHopList() {
         return this.hopList;
     }
 
-    public void setASAPHopList(List<ASAPHop> asapHopList) {
+    public void setASAPHopList(List<ASAPHop> asapHopList) throws IOException {
         this.hopList = asapHopList;
+        this.saveStatus();
     }
 
     public HashMap<String, String> getExtraData() {

test/net/sharksystem/CountsReceivedMessagesListener.java

@@ -29,17 +29,6 @@ public void asapMessagesReceived(ASAPMessages messages,
             System.out.print(peerName);
         }
 
-        StringBuilder sb = new StringBuilder();
-        for(ASAPHop hop : asapHopsList) {
-            sb.append(hop.toString());
-            sb.append("\n");
-        }
-
-        System.out.println("\n###############################################################################");
-        System.out.println("messages received (" + format + " | " + uri + "). size == " + messages.size()
-                + "hops\n" + sb.toString());
-        System.out.println("###############################################################################");
-
         this.numberOfMessages++;
     }
 }