working on first version that really works in Android

Author: thsc

src/net/sharksystem/asp3/ASP3Chunk.java

@@ -1,65 +1,31 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
 package net.sharksystem.asp3;
 
 import java.io.IOException;
 import java.util.Iterator;
-import java.util.List;
 
 /**
- * A chunk represents a set of messages addressed by an URI. 
- *  
- * 
+ *
  * @author thsc
- * @see ASPChunkStorage for more details
  */
 public interface ASP3Chunk {
-   
     /**
      * 
      * @return number of message in that chunk
      */
     int getNumberMessage();
-
-    /**
-     * 
-     * @return recipients of that chunk 
-     */
-    List<CharSequence> getRecipients();
-
-    /**
-     * add recipients
-     * @param recipient
-     * @throws IOException 
-     */
-    void addRecipient(CharSequence recipient) throws IOException;
-
-    /**
-     * set a list of recipients. Former recipients are dikscarded
-     * @param recipients
-     * @throws IOException 
-     */
-    void setRecipients(List<CharSequence> recipients) throws IOException;
-
-    /**
-     * recipient is removed
-     * @param recipients
-     * @throws IOException 
-     */
-    void removeRecipient(CharSequence recipients) throws IOException;
-
+    
     /**
      * URI which represents topic of messages in that chunk
      * @return
      * @throws IOException 
      */
     String getUri() throws IOException;
 
-    /**
-     * adds a message
-     * @param message
-     * @throws IOException 
-     */
-    void add(CharSequence message) throws IOException;
-
     /**
      * 
      * @return iterator of all messages in the chunk
@@ -73,4 +39,6 @@ public interface ASP3Chunk {
      * have an undefined behaviour.
      */
     public void drop();
+    
+    public int getEra() throws IOException;
 }

src/net/sharksystem/asp3/ASP3Chunk2Send.java

@@ -0,0 +1,48 @@
+package net.sharksystem.asp3;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * A chunk represents a set of messages addressed by an URI. 
+ *  
+ * 
+ * @author thsc
+ * @see ASPChunkStorage for more details
+ */
+public interface ASP3Chunk2Send extends ASP3Chunk {
+    /**
+     * 
+     * @return recipients of that chunk 
+     */
+    List<CharSequence> getRecipients();
+
+    /**
+     * add recipients
+     * @param recipient
+     * @throws IOException 
+     */
+    void addRecipient(CharSequence recipient) throws IOException;
+
+    /**
+     * set a list of recipients. Former recipients are dikscarded
+     * @param recipients
+     * @throws IOException 
+     */
+    void setRecipients(List<CharSequence> recipients) throws IOException;
+
+    /**
+     * recipient is removed
+     * @param recipients
+     * @throws IOException 
+     */
+    void removeRecipient(CharSequence recipients) throws IOException;
+
+    /**
+     * adds a message
+     * @param message
+     * @throws IOException 
+     */
+    void add(CharSequence message) throws IOException;
+}

src/net/sharksystem/asp3/ASP3ChunkFS.java

@@ -18,7 +18,7 @@
  *
  * @author thsc
  */
-class ASP3ChunkFS implements ASP3Chunk {
+class ASP3ChunkFS implements ASP3Chunk2Send, ASP3ChunkReceived {
     public static final String META_DATA_EXTENSION = "meta";
     public static final String DATA_EXTENSION = "content";
     public static final String DEFAULT_URL = "content://sharksystem.net/noContext";
@@ -29,11 +29,19 @@ class ASP3ChunkFS implements ASP3Chunk {
     private File messageFile;
 
     private int numberMessage = 0;
+    private int era;
+    private String sender;
 
 
     ASP3ChunkFS(ASP3StorageFS storage, String targetUri, int era) throws IOException {
+        this(storage, targetUri, era, null);
+    }
+
+    ASP3ChunkFS(ASP3StorageFS storage, String targetUri, int era, String sender) throws IOException {
         this.storage = storage;
         this.uri = targetUri;
+        this.era = era;
+        this.sender = sender;
 
         String trunkName = this.storage.getFullFileName(era, targetUri);
 
@@ -194,6 +202,21 @@ public int getNumberMessage() {
         return this.numberMessage;
     }
 
+    @Override
+    public int getEra() throws IOException {
+        return this.era;
+    }
+
+    @Override
+    public CharSequence getSender() throws IOException {
+        return this.sender;
+    }
+
+    @Override
+    public void addReceivedMessage(CharSequence message) throws IOException {
+        this.add(message);
+    }
+
     private class MessageIter implements Iterator {
 
         private final DataInputStream dis;

src/net/sharksystem/asp3/ASP3ChunkReader.java

@@ -36,7 +36,8 @@ public void run() {
         b.append("start reading ");
         System.out.println(b.toString());
         //>>>>>>>>>>>>>>>>>>>debug
-
+        
+        this.reader.newSender(peer);
         try {
             String chunkUrl = dis.readUTF();
             //<<<<<<<<<<<<<<<<<<debug
@@ -58,7 +59,7 @@ public void run() {
                 //>>>>>>>>>>>>>>>>>>>debug
 
                 if(this.reader != null) {
-                    this.reader.read(chunkUrl, peer, message);
+                    this.reader.read(chunkUrl, message);
                 }
             }
         } catch (IOException ex) {

src/net/sharksystem/asp3/ASP3ChunkReceived.java

@@ -0,0 +1,13 @@
+package net.sharksystem.asp3;
+
+import java.io.IOException;
+
+/**
+ *
+ * @author thsc
+ */
+public interface ASP3ChunkReceived extends ASP3Chunk {
+    CharSequence getSender() throws IOException;
+    
+    void addReceivedMessage(CharSequence message) throws IOException;
+}

src/net/sharksystem/asp3/ASP3ChunkStorage.java

@@ -46,7 +46,8 @@
  * 
  * @author thsc
  */
-public interface ASP3ChunkStorage extends ASP3Storage {
+public interface ASP3ChunkStorage /*extends ASP3Storage */{
+
 
     /**
      * Adds a recipient to chunk recipient list.
@@ -119,4 +120,6 @@ public interface ASP3ChunkStorage extends ASP3Storage {
      * @return 
      */
     public int getPreviousEra(int era);
+    
+    public ASP3Storage getReceivedChunkStorage(CharSequence sender);
 }

src/net/sharksystem/asp3/ASP3DefaultReader.java

@@ -0,0 +1,30 @@
+package net.sharksystem.asp3;
+
+/**
+ *
+ * @author thsc
+ */
+class ASP3DefaultReader implements ASP3Reader {
+
+    private String sender;
+    private int era;
+    private ASP3Storage storage;
+    private ASP3Engine engine;
+
+    public ASP3DefaultReader() {
+    }
+
+    public void newSender(String sender) {
+        this.sender = sender;
+    }
+    
+    @Override
+    public void read(String urlTarget, String message) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    void setEngine(ASP3Engine engine) {
+        this.engine = engine;
+    }
+    
+}

src/net/sharksystem/asp3/ASP3Engine.java

@@ -18,7 +18,7 @@
  * @see ASP3Reader
  * @author thsc
  */
-public class ASP3Engine implements ASP3ChunkStorage, ASP3ProtocolEngine {
+public abstract class ASP3Engine implements ASP3ChunkStorage, ASP3ProtocolEngine {
     public static final String ANONYMOUS_OWNER = "anon";
     static String DEFAULT_OWNER = ANONYMOUS_OWNER;
     static int DEFAULT_INIT_ERA = 0;
@@ -31,9 +31,9 @@ public class ASP3Engine implements ASP3ChunkStorage, ASP3ProtocolEngine {
     protected ASP3Memento memento = null;
 
     private final ASP3Reader reader;
-    /* private */ final ASP3Storage chunkStorage;
+    /* private */ final private ASP3Storage chunkStorage;
 
-    ASP3Engine(ASP3Storage chunkStorage, ASP3Reader reader) 
+    protected ASP3Engine(ASP3Storage chunkStorage, ASP3Reader reader) 
             throws ASP3Exception, IOException {
 
         this.chunkStorage = chunkStorage;
@@ -45,9 +45,9 @@ public class ASP3Engine implements ASP3ChunkStorage, ASP3ProtocolEngine {
         }
         */
     }
-
-    ASP3Engine(ASP3Storage chunkStorage) throws ASP3Exception, IOException {
-                this(chunkStorage, null);
+    
+    ASP3Storage getStorage() {
+        return this.chunkStorage;
     }
 
     //////////////////////////////////////////////////////////////////////
@@ -71,26 +71,11 @@ public void removeRecipient(CharSequence urlTarget, CharSequence recipients) thr
 
     @Override
     public void add(CharSequence urlTarget, CharSequence message) throws IOException {
-        ASP3Chunk chunk = this.chunkStorage.getChunk(urlTarget, this.era);
+        ASP3Chunk2Send chunk = this.chunkStorage.getChunk(urlTarget, this.era);
 
         chunk.add(message);
     }
 
-    @Override
-    public ASP3Chunk getChunk(CharSequence urlTarget, int era) throws IOException {
-        return this.chunkStorage.getChunk(urlTarget, era);
-    }
-
-    @Override
-    public List<ASP3Chunk> getChunks(int era) throws IOException {
-        return this.chunkStorage.getChunks(era);
-    }
-
-    @Override
-    public void dropChunks(int era) throws IOException {
-        this.chunkStorage.dropChunks(era);
-    }
-
     //////////////////////////////////////////////////////////////////////
     //                       ProtocolEngine                             //
     //////////////////////////////////////////////////////////////////////
@@ -198,7 +183,7 @@ public void handleConnection(InputStream is, OutputStream os) {
             do {
                 lastRound = workingEra == currentEra;
 
-                List<ASP3Chunk> chunks = this.chunkStorage.getChunks(workingEra);
+                List<ASP3Chunk2Send> chunks = this.chunkStorage.getChunks(workingEra);
                 //<<<<<<<<<<<<<<<<<<debug
                 b = new StringBuilder();
                 b.append(this.getLogStart());
@@ -207,7 +192,7 @@ public void handleConnection(InputStream is, OutputStream os) {
                 System.out.println(b.toString());
                 //>>>>>>>>>>>>>>>>>>>debug
 
-                for(ASP3Chunk chunk : chunks) {
+                for(ASP3Chunk2Send chunk : chunks) {
                     //<<<<<<<<<<<<<<<<<<debug
                     b = new StringBuilder();
                     b.append(this.getLogStart());
@@ -369,7 +354,7 @@ private synchronized void incrementEra() throws IOException {
         this.chunkStorage.dropChunks(this.era); 
     }
 
-    private void sendChunk(ASP3Chunk chunk, DataOutputStream dos) 
+    private void sendChunk(ASP3Chunk2Send chunk, DataOutputStream dos) 
             throws IOException {
 
         //<<<<<<<<<<<<<<<<<<debug
@@ -434,7 +419,7 @@ private void sendChunk(ASP3Chunk chunk, DataOutputStream dos)
      * @param chunk
      * @return 
      */
-    private boolean isPublic(ASP3Chunk chunk) {
+    private boolean isPublic(ASP3Chunk2Send chunk) {
         return chunk.getRecipients().isEmpty();
     }