rename StructFactory -> FromStructReader

Makefile

@@ -1,11 +1,11 @@
 CXX=g++ -std=c++11
 
 CAPNP_SOURCES=\
+	src/capnp/FromStructReader.java\
 	src/capnp/ListPointer.java\
 	src/capnp/ListReader.java\
 	src/capnp/PointerReader.java\
 	src/capnp/SegmentReader.java\
-	src/capnp/StructFactory.java\
 	src/capnp/StructReader.java\
 	src/capnp/StructList.java\
 	src/capnp/Text.java\

src/capnp/FromStructReader.java

@@ -0,0 +1,5 @@
+package capnp;
+
+public interface FromStructReader<T> {
+    public abstract T fromStructReader(StructReader reader);
+}

src/capnp/StructFactory.java

@@ -1,5 +0,0 @@
-package capnp;
-
-public interface StructFactory<T> {
-    public abstract T createFromStructReader(StructReader reader);
-}

src/capnp/StructList.java

@@ -4,9 +4,9 @@ package capnp;
 public class StructList {
     public static class Reader<T> {
         public ListReader reader;
-        public StructFactory<T> factory;
+        public FromStructReader<T> factory;
 
-        public Reader(ListReader reader, StructFactory<T> factory) {
+        public Reader(ListReader reader, FromStructReader<T> factory) {
             this.reader = reader;
             this.factory = factory;
         }
@@ -16,8 +16,7 @@ public class StructList {
         }
 
         public T get(int index) {
-            StructReader sr = this.reader.getStructElement(index);
+            return this.factory.fromStructReader(this.reader.getStructElement(index));
-            return this.factory.createFromStructReader(sr);
         }
     }