hop list is now accessible when iterating message from a channel.

Author: thsc42

src/net/sharksystem/asap/ASAPMessages.java

@@ -1,6 +1,7 @@
 package net.sharksystem.asap;
 
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.engine.ASAPInternalChunk;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -69,4 +70,12 @@ CharSequence getMessageAsCharSequence(int position, boolean chronologically)
 
     byte[] getMessage(int position, boolean chronologically)
             throws ASAPException, IOException;
+
+    /**
+     * Return chunk in which message at position is to be found
+     * @param position
+     * @param chronologically
+     * @return
+     */
+    ASAPInternalChunk getChunk(int position, boolean chronologically) throws IOException, ASAPException;
 }

src/net/sharksystem/asap/apps/testsupport/ASAPMessagesMock.java

@@ -147,6 +147,32 @@ public CharSequence getMessageAsCharSequence(int position, boolean chronological
         return new String(this.getMessage(position, chronologically));
     }
 
+    public ASAPInternalChunk getChunk(int position, boolean chronologically) throws IOException, ASAPException {
+        this.initialize();
+
+        if(position >= this.numberOfMessages)
+            throw new ASAPException("Position reaches beyond total number of messages in this chunk (is it even empty?)");
+
+        if(!chronologically) {
+            // invert position - first becomes last etc.
+            position = this.numberOfMessages - 1 - position;
+        }
+
+        ASAPInternalChunk foundChunk = null;
+        // find chunk
+        for(ASAPInternalChunk chunk : this.chunkList) {
+            if(position < chunk.getNumberMessage()) {
+                foundChunk = chunk;
+                break;
+            }
+
+            position -= chunk.getNumberMessage();
+        }
+
+        if(foundChunk == null) throw new ASAPException("cannot find chunk for position - looks like a bug");
+        return foundChunk;
+    }
+
     @Override
     public byte[] getMessage(int position, boolean chronologically)
             throws ASAPException, IOException {
@@ -162,7 +188,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); 
+            return this.messageCache.get(position - this.firstIndexMessageCache);
         }
 
         // not yet in cache - find chunk with required message

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

@@ -1,10 +1,12 @@
 package net.sharksystem.asap.engine;
 
+import net.sharksystem.SharkNotSupportedException;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPMessageCompare;
 import net.sharksystem.asap.ASAPMessages;
 import net.sharksystem.asap.utils.PeerIDHelper;
 
+import javax.xml.transform.Source;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -360,13 +362,12 @@ private List<SourceIndex> getIndexList(boolean chronologically) {
         return chronologically ? oldFirstPositionList : newFirstPositionList;
     }
 
-    @Override
-    public byte[] getMessage(int position, boolean chronologically) throws ASAPException, IOException {
+    private SourceIndex getSourceIndex(int position, boolean chronologically) throws ASAPException, IOException {
         if(position >= this.size)
             throw new ASAPException("position index must not exceed total number of messages: "
-                + position + " >= " + this.size);
+                    + position + " >= " + this.size);
 
-        SourceIndex sourceIndex = null;
+        SourceIndex sourceIndex;
         List<SourceIndex> usedList = this.getIndexList(chronologically);
 
         sourceIndex = this.getSourceIndex(position, usedList);
@@ -380,7 +381,19 @@ public byte[] getMessage(int position, boolean chronologically) throws ASAPExcep
             throw new ASAPException("no message at position: " + position);
         }
 
+        return sourceIndex;
+    }
+
+    @Override
+    public byte[] getMessage(int position, boolean chronologically) throws ASAPException, IOException {
+        SourceIndex sourceIndex = this.getSourceIndex(position, chronologically);
         return this.messageSources[sourceIndex.sourceIndex].getMessage(
                 sourceIndex.positionInSource, chronologically);
     }
+
+    @Override
+    public ASAPInternalChunk getChunk(int position, boolean chronologically) throws IOException, ASAPException {
+        SourceIndex sourceIndex = this.getSourceIndex(position, chronologically);
+        return this.messageSources[sourceIndex.positionInSource].getChunk(sourceIndex.positionInSource, chronologically);
+    }
 }