sync development with makan sub project

Author: thsc42

src/net/sharksystem/asap/ASAPChunk.java

@@ -88,7 +88,7 @@ public interface ASAPChunk {
 
     /**
      * adds a message
-     * @param message
+     * @param messageAsBytes
      * @throws IOException
      * @deprecated
      */

src/net/sharksystem/asap/ASAPChunkFS.java

@@ -125,8 +125,10 @@ public void addRecipient(CharSequence recipient) throws IOException {
     @Override
     public void setRecipients(Collection<CharSequence> newRecipients) throws IOException {
         this.recipients = new HashSet<>();
-        for(CharSequence recipient : newRecipients) {
-            this.recipients.add(recipient);
+        if(recipients != null) {
+            for (CharSequence recipient : newRecipients) {
+                this.recipients.add(recipient);
+            }
         }
 
         this.writeMetaData(this.metaFile);

src/net/sharksystem/asap/ASAPEngine.java

@@ -155,8 +155,8 @@ public Set<CharSequence> getRecipients(CharSequence urlTarget) throws IOExceptio
         return this.chunkStorage.getChunk(urlTarget, this.era).getRecipients();
     }
 
-    public void removeRecipient(CharSequence urlTarget, CharSequence recipients) throws IOException {
-        this.chunkStorage.getChunk(urlTarget, this.era).removeRecipient(recipients);
+    public void removeRecipient(CharSequence urlTarget, CharSequence recipient) throws IOException {
+        this.chunkStorage.getChunk(urlTarget, this.era).removeRecipient(recipient);
     }
 
     @Override

src/net/sharksystem/asap/ASAPStorage.java

@@ -137,6 +137,8 @@ public interface ASAPStorage {
      */
     public Set<CharSequence> getRecipients(CharSequence urlTarget) throws IOException;
 
+    void addRecipient(CharSequence urlTarget, CharSequence recipient) throws IOException;
+    public void removeRecipient(CharSequence urlTarget, CharSequence recipient) throws IOException;
     /**
      * Put some extra information on that channel
      * @param uri describing the channel

src/net/sharksystem/asap/util/Helper.java

@@ -25,6 +25,16 @@ public static String collection2String(Collection<CharSequence> stringList) {
         return sb.toString();
     }
 
+    public static byte[] characterSequence2bytes(CharSequence cs) {
+        // TODO - that's ok?
+        return cs.toString().getBytes();
+    }
+
+    public static CharSequence bytes2characterSequence(byte[] bytes) {
+        // TODO - that's ok?
+        return  new String(bytes);
+    }
+
     public static List<CharSequence> string2CharSequenceList(String s) {
         StringTokenizer t = new StringTokenizer(s, SERIALIZATION_DELIMITER);
         ArrayList<CharSequence> list = new ArrayList<CharSequence>();

src/net/sharksystem/asap/util/Log.java

@@ -5,8 +5,8 @@ public static StringBuilder startLog(Object o) {
         return Log.startLog(o.getClass());
     }
 
-    public static StringBuilder startLog(Class c) {
-        StringBuilder sb = new StringBuilder();
+        public static StringBuilder startLog(Class c) {
+            StringBuilder sb = new StringBuilder();
         sb.append(c.getSimpleName());
         sb.append(": ");
         return sb;