working.. no working version yet

Author: thsc

nbproject/project.properties

@@ -1,16 +1,25 @@
-#Mon Jan 07 17:57:59 CET 2019
+application.title=ASP3Java
+application.vendor=thsc
+endorsed.classpath=
+#Tue Jan 08 10:18:01 CET 2019
 excludes=
 javac.deprecation=false
-jlink.additionalparam=
 build.test.results.dir=${build.dir}/test/results
-run.classpath=${javac.classpath}\:${build.classes.dir}
+jlink.additionalparam=
+javac.external.vm=true
 jlink.additionalmodules=
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
 javadoc.nonavbar=false
-javac.external.vm=true
-javac.test.modulepath=${javac.modulepath}
-run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-javac.processorpath=${javac.classpath}
+javac.processorpath=\
+    ${javac.classpath}
 javac.target=1.8
 annotation.processing.processors.list=
 javadoc.noindex=false
@@ -25,53 +34,53 @@ javadoc.author=false
 test.src.dir=${file.reference.ASP3Java-test}
 build.dir=build
 build.test.classes.dir=${build.dir}/test/classes
-run.modulepath=${javac.modulepath}
 platform.active=default_platform
 javac.compilerargs=
+run.modulepath=\
+    ${javac.modulepath}
 main.class=
 dist.jar=${dist.dir}/ASP3Java.jar
 javac.test.processorpath=${javac.test.classpath}
-javadoc.use=true
 file.reference.ASP3Java-src=src
-dist.archive.excludes=
+javadoc.use=true
 build.sysclasspath=ignore
+dist.archive.excludes=
 debug.test.classpath=${run.test.classpath}
 dist.dir=dist
 build.classes.excludes=**/*.java,**/*.form
-annotation.processing.processor.options=
-javadoc.splitindex=true
 javadoc.encoding=${source.encoding}
+javadoc.splitindex=true
 javac.source=1.8
 javac.modulepath=
-junit.selected.version=4
+junit.selected.version=3
 debug.classpath=${run.classpath}
 run.jvmargs=
-run.test.modulepath=${javac.test.modulepath}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+jar.compress=false
+build.generated.dir=${build.dir}/generated
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
     ${libs.junit_4.classpath}:\
     ${libs.hamcrest.classpath}
-build.generated.dir=${build.dir}/generated
-jar.compress=false
 javadoc.private=false
 debug.test.modulepath=${run.test.modulepath}
 annotation.processing.run.all.processors=true
 meta.inf.dir=${src.dir}/META-INF
-manifest.file=manifest.mf
 annotation.processing.enabled=true
+manifest.file=manifest.mf
 jlink.launcher=true
-dist.jlink.output=${dist.jlink.dir}/ASP3Java
 dist.javadoc.dir=${dist.dir}/javadoc
-src.dir=${file.reference.ASP3Java-src}
+dist.jlink.output=${dist.jlink.dir}/ASP3Java
 debug.modulepath=${run.modulepath}
+src.dir=${file.reference.ASP3Java-src}
 mkdist.disabled=false
-javac.classpath=
 annotation.processing.enabled.in.editor=false
+javac.classpath=
 dist.jlink.dir=${dist.dir}/jlink
-jlink.launcher.name=ASP3Java
 build.generated.sources.dir=${build.dir}/generated-sources
+jlink.launcher.name=ASP3Java
 javadoc.version=false
 javadoc.windowtitle=
 javadoc.notree=false

src/net/sharksystem/asp3/ASP3Chunk.java

@@ -10,7 +10,7 @@
  * 
  * @author thsc
  */
-interface ASP3Chunk {
+public interface ASP3Chunk {
 
     /**
      * 

src/net/sharksystem/asp3/ASP3ChunkReader.java

@@ -0,0 +1,68 @@
+package net.sharksystem.asp3;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+
+class ASP3ChunkReader implements Runnable {
+    ASP3Reader reader;
+    private final DataInputStream dis;
+    private final String peer;
+    private final String owner;
+
+    ASP3ChunkReader(ASP3Reader reader, DataInputStream dis, String owner, 
+            String peer) {
+        this.reader = reader;
+        this.dis = dis;
+        this.peer = peer;
+        this.owner = owner;
+    }
+
+    private String getLogStart() {
+        StringBuilder b = new StringBuilder();
+        b.append("ASP3ChunkReader (");
+        b.append(this.owner);
+        b.append(") connected to (");
+        b.append(this.peer);
+        b.append(") ");
+
+        return b.toString();
+    }
+
+    @Override
+    public void run() {
+        //<<<<<<<<<<<<<<<<<<debug
+        StringBuilder b = new StringBuilder();
+        b.append(this.getLogStart());
+        b.append("start reading ");
+        System.out.println(b.toString());
+        //>>>>>>>>>>>>>>>>>>>debug
+
+        try {
+            String chunkUrl = dis.readUTF();
+            //<<<<<<<<<<<<<<<<<<debug
+            b = new StringBuilder();
+            b.append(this.getLogStart());
+            b.append("read chunk URL: ");
+            b.append(chunkUrl);
+            System.out.println(b.toString());
+            //>>>>>>>>>>>>>>>>>>>debug
+            for(;;) {
+                // escapes with IOException
+                String message = dis.readUTF();
+                //<<<<<<<<<<<<<<<<<<debug
+                b = new StringBuilder();
+                b.append(this.getLogStart());
+                b.append("read message: ");
+                b.append(message);
+                System.out.println(b.toString());
+                //>>>>>>>>>>>>>>>>>>>debug
+
+                if(this.reader != null) {
+                    this.reader.read(chunkUrl, peer, message);
+                }
+            }
+        } catch (IOException ex) {
+            // done
+        }
+    }
+}

src/net/sharksystem/asp3/ASP3Writer.java …t/sharksystem/asp3/ASP3ChunkStorage.javasrc/net/sharksystem/asp3/ASP3Writer.java renamed to src/net/sharksystem/asp3/ASP3ChunkStorage.java src/net/sharksystem/asp3/ASP3Writer.java renamed to src/net/sharksystem/asp3/ASP3ChunkStorage.java

@@ -7,7 +7,7 @@
  *
  * @author thsc
  */
-public interface ASP3Writer {
+public interface ASP3ChunkStorage extends ASP3Storage {
 
     public void addRecipient(CharSequence urlTarget, CharSequence recipient) throws IOException;
     public void setRecipients(CharSequence urlTarget, List<CharSequence> recipients) throws IOException;
@@ -20,4 +20,5 @@ public interface ASP3Writer {
     public int getOldestEra();
     public int getEra();
     public int getNextEra(int era);
+    public int getPreviousEra(int era);
 }