refactored asp3 to aasp

Author: thsc42

src/net/sharksystem/aasp/AASPChunkReader.java

@@ -27,7 +27,7 @@ class AASPChunkReader implements Runnable {
 
     private String getLogStart() {
         StringBuilder b = new StringBuilder();
-        b.append("ASP3ChunkReader (");
+        b.append("AASPChunkReader (");
         b.append(this.owner);
         b.append(") connected to (");
         b.append(this.peer);

src/net/sharksystem/aasp/AASPEngine.java

@@ -10,11 +10,11 @@
 import java.util.List;
 
 /**
- * That ASP3Engine manages exchange of stored messages with peers.
+ * That AASPEngine manages exchange of stored messages with peers.
  * See ASPChunkStorage for details.
  * 
  * @see AASPStorage
- * @see ASP3Reader
+ * @see AASPReader
  * @author thsc
  */
 public abstract class AASPEngine implements AASPStorage, AASPProtocolEngine {

src/net/sharksystem/aasp/AASPEngineFS.java

@@ -5,11 +5,11 @@
 import java.util.HashMap;
 
 /**
- * ASP3Engine that stores data in file system.
+ * AASPEngine that stores data in file system.
  * @author thsc
  */
 public class AASPEngineFS extends AASPEngine {
-    public static final String MEMENTO_FILENAME = "asp3CurrentAttributes";
+    public static final String MEMENTO_FILENAME = "aaspCurrentAttributes";
     private final String rootDirectory;
     private AASPChunkStorageFS chunkStorageFS;
 
@@ -22,7 +22,7 @@ private AASPEngineFS(String rootDirectory,
         this.rootDirectory = rootDirectory;
     }
 
-    public static AASPStorage getASP3ChunkStorage(String owner, String rootDirectory) 
+    public static AASPStorage getAASPChunkStorage(String owner, String rootDirectory) 
             throws IOException, AASPException {
 
         // check if root directory already exists. If not srt it up
@@ -31,24 +31,24 @@ public static AASPStorage getASP3ChunkStorage(String owner, String rootDirectory
             root.mkdirs();
         }
 
-        return AASPEngineFS.getASP3Engine(owner, rootDirectory);
+        return AASPEngineFS.getAASPEngine(owner, rootDirectory);
 
     }
 
-    public static AASPStorage getASP3ChunkStorage(String rootDirectory) 
+    public static AASPStorage getAASPChunkStorage(String rootDirectory) 
             throws IOException, AASPException {
 
-        return AASPEngineFS.getASP3ChunkStorage(AASPEngineFS.DEFAULT_OWNER, rootDirectory);
+        return AASPEngineFS.getAASPChunkStorage(AASPEngineFS.DEFAULT_OWNER, rootDirectory);
 
     }
 
-    public static AASPEngine getASP3Engine(String owner, String rootDirectory) 
+    public static AASPEngine getAASPEngine(String owner, String rootDirectory) 
             throws IOException, AASPException {
 
         // root directory must exist when setting up an engine
         File root = new File(rootDirectory);
         if(!root.exists() || !root.isDirectory()) {
-            throw new AASPException("chunk root directory must exist when creating an ASP3Engine");
+            throw new AASPException("chunk root directory must exist when creating an AASPEngine");
         }
 
         AASPEngineFS engine = new AASPEngineFS(
@@ -79,10 +79,10 @@ public static AASPEngine getASP3Engine(String owner, String rootDirectory)
         return engine;
     }
 
-    public static AASPEngine getASP3Engine(String rootDirectory) 
+    public static AASPEngine getAASPEngine(String rootDirectory) 
             throws IOException, AASPException {
 
-        return AASPEngineFS.getASP3Engine(null, rootDirectory);
+        return AASPEngineFS.getAASPEngine(null, rootDirectory);
 
     }
 

src/net/sharksystem/aasp/AASPStorage.java

@@ -9,19 +9,19 @@
  * That chunk storage is meant to keep messages which are produced by an
  * app for later transmission.
  * 
- * Messages which cannot be sent to their recipients can be stored in ASP3 chunks.
+ * Messages which cannot be sent to their recipients can be stored in AASP chunks.
  * Each chunk is addressed with an URI (comparable to URIs e.g. in Android
  * Content Provider)
  * 
  * Applications can easlily store their messages by calling add(URI, message).
  * That message is stored in a chunk addressed by the URI. 
  * 
- * Each chunk has a recipient list which can be changed anytime. The ASP3Engine
+ * Each chunk has a recipient list which can be changed anytime. The AASPEngine
  * uses those information for sending such stored messages whenever a peer
  * establishes a connection.
  * 
- * It is recommended to use ASP3EngineFS to set up that framework.
- * Create a ASP3Engine like this
+ * It is recommended to use AASPEngineFS to set up that framework.
+ * Create a AASPEngine like this
  * 
  * <pre>
  * AASPReader reader = ...;

test/BasicTests.java

@@ -64,20 +64,20 @@ public void androidUsage() throws IOException, AASPException, InterruptedExcepti
 
         // alice writes a message into chunkStorage
         AASPStorage aliceStorage = 
-                AASPEngineFS.getASP3ChunkStorage(ALICE_FOLDER);
+                AASPEngineFS.getAASPChunkStorage(ALICE_FOLDER);
 
         aliceStorage.add(ALICE_BOB_CHAT_URL, ALICE2BOB_MESSAGE);
 
         // bob does the same
         AASPStorage bobStorage = 
-                AASPEngineFS.getASP3ChunkStorage(BOB_FOLDER);
+                AASPEngineFS.getAASPChunkStorage(BOB_FOLDER);
 
         bobStorage.add(ALICE_BOB_CHAT_URL, BOB2ALICE_MESSAGE);
 
         // now set up both engines / use default reader
-        AASPEngine aliceEngine = AASPEngineFS.getASP3Engine("Alice", ALICE_FOLDER);
+        AASPEngine aliceEngine = AASPEngineFS.getAASPEngine("Alice", ALICE_FOLDER);
 
-        AASPEngine bobEngine = AASPEngineFS.getASP3Engine("Bob", BOB_FOLDER);
+        AASPEngine bobEngine = AASPEngineFS.getAASPEngine("Bob", BOB_FOLDER);
 
         AASPChunkReceiverTester aliceListener = new AASPChunkReceiverTester();
         AASPChunkReceiverTester bobListener = new AASPChunkReceiverTester();
@@ -108,7 +108,7 @@ public void androidUsage() throws IOException, AASPException, InterruptedExcepti
         // wait until communication probably ends
         Thread.sleep(10000);
 
-        // close connections: note ASP3Engine does NOT close any connection!!
+        // close connections: note AASPEngine does NOT close any connection!!
         aliceChannel.close();
         bobChannel.close();
         Thread.sleep(1000);

test/net/sharksystem/aasp/WhiteBoxTests.java

@@ -1,12 +1,9 @@
 package net.sharksystem.aasp;
 
-import net.sharksystem.aasp.AASPException;
-import net.sharksystem.aasp.AASPEngine;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import org.junit.Test;
-import net.sharksystem.aasp.AASPChunk;
 
 /**
  *
@@ -19,7 +16,7 @@ public WhiteBoxTests() {
 
     @Test
     public void chunksIter() throws IOException, AASPException {
-        AASPEngine bobEngine = AASPEngineFS.getASP3Engine("bob");
+        AASPEngine bobEngine = AASPEngineFS.getAASPEngine("bob");
 
         List<AASPChunk> chunks = bobEngine.getStorage().getChunks(0);
         Iterator<CharSequence> messages = chunks.iterator().next().getMessages();