refactured pdu reader - made it inner class of persistent connection

Author: thsc42

src/net/sharksystem/asap/MultiASAPEngineFS.java

@@ -47,9 +47,6 @@ public interface MultiASAPEngineFS {
 
     public void pushInterests(OutputStream os) throws IOException, ASAPException;
 
-    Thread getExecutorThread(ASAP_PDU_1_0 asappdu, InputStream is, OutputStream os,
-                             ThreadFinishedListener threadFinishedListener) throws ASAPException;
-
     Set<CharSequence> getOnlinePeers();
 
     boolean existASAPConnection(CharSequence recipient);

src/net/sharksystem/asap/MultiASAPEngineFS_Impl.java

@@ -346,15 +346,15 @@ public void pushInterests(OutputStream os) throws IOException, ASAPException {
             protocol.interest(this.owner, null, format,null, -1, -1, os, false);
         }
     }
-
-    @Override
+/*
     public Thread getExecutorThread(ASAP_PDU_1_0 asappdu, InputStream is, OutputStream os,
                                     ThreadFinishedListener threadFinishedListener) throws ASAPException {
         // process pdu
         return new ASAPPersistentConnection.ASAPPDUExecutor(asappdu, is, os,
                 this.getEngineSettings(asappdu.getFormat()),
                 new ASAP_Modem_Impl(), threadFinishedListener);
     }
+ */
 
    private String getLogStart() {
         return this.getClass().getSimpleName() + ": ";

src/net/sharksystem/asap/protocol/ASAPPDUReader.java

@@ -170,7 +170,6 @@ private synchronized void checkRunningOnlineMessageSender() {
         }
     }
 
-
     public void run() {
         ASAP_1_0 protocol = new ASAP_Modem_Impl();
 
@@ -231,13 +230,11 @@ public void run() {
                             + "got asap management message - not processed, took remote peer name only");
                 } else {
                     try {
-                        this.executor =
-                                new ASAPPDUExecutor(asappdu,
-                                        this.is, this.os,
-                                        this.multiASAPEngineFS.getEngineSettings(asappdu.getFormat()),
-                                        new ASAP_Modem_Impl(),
-                                        this);
-//                        this.multiASAPEngineFS.getExecutorThread(asappdu, this.is, this.os, this);
+                        this.executor = new ASAPPDUExecutor(asappdu,
+                                            this.is, this.os,
+                                            this.multiASAPEngineFS.getEngineSettings(asappdu.getFormat()),
+                                            protocol,this);
+
                         // get exclusive access to streams
                         System.out.println(this.startLog() + "asap pdu executor going to wait for stream access");
                         this.wait4ExclusiveStreamsAccess();
@@ -339,7 +336,7 @@ private StringBuilder startLog() {
         return sb;
     }
 
-    public static class ASAPPDUExecutor extends Thread {
+    private class ASAPPDUExecutor extends Thread {
         private final ASAP_PDU_1_0 asapPDU;
         private final InputStream is;
         private final OutputStream os;
@@ -418,4 +415,47 @@ public void run() {
             }
         }
     }
+
+    private class ASAPPDUReader extends Thread {
+        private final ASAP_1_0 protocol;
+        private final InputStream is;
+        private final ThreadFinishedListener pduReaderListener;
+        private ASAP_PDU_1_0 asapPDU = null;
+        private IOException ioException = null;
+        private ASAPException asapException = null;
+
+        ASAPPDUReader(ASAP_1_0 protocol, InputStream is, ThreadFinishedListener listener) {
+            this.protocol = protocol;
+            this.is = is;
+            this.pduReaderListener = listener;
+        }
+
+        IOException getIoException() {
+            return this.ioException;
+        }
+
+        ASAPException getAsapException() {
+            return this.asapException;
+        }
+
+        ASAP_PDU_1_0 getASAPPDU() {
+            return this.asapPDU;
+        }
+
+        public void run() {
+            try {
+                this.asapPDU = protocol.readPDU(is);
+    //            this.pduReaderListener.finished(this);
+            } catch (IOException e) {
+                this.ioException = e;
+            } catch (ASAPException e) {
+                this.asapException = e;
+            }
+            finally {
+                if(this.pduReaderListener != null) {
+                    this.pduReaderListener.finished(this);
+                }
+            }
+        }
+    }
 }

src/net/sharksystem/asap/protocol/ASAPPersistentConnection.java

@@ -17,7 +17,7 @@
  * Here are some basic tests and usage examples.
  * @author thsc
  */
-public class CommunicationTests {
+public class Point2PointTests {
     public static final String ALICE_BOB_CHAT_URL = "content://aliceAndBob.talk";
     public static final String CHAT_FORMAT = "application/x-sn2-makan";
     public static final String ALICE_ROOT_FOLDER = "tests/alice";