From 836ecf00cd6c2d0dfb6a2c7fb593ea83a8acc5a3 Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Sat, 10 May 2014 12:36:21 -0400
Subject: [PATCH] rename StructFactory -> FromStructReader

---
 Makefile                        | 2 +-
 src/capnp/FromStructReader.java | 5 +++++
 src/capnp/StructFactory.java    | 5 -----
 src/capnp/StructList.java       | 7 +++----
 4 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 src/capnp/FromStructReader.java
 delete mode 100644 src/capnp/StructFactory.java

diff --git a/Makefile b/Makefile
index dd31171..6dc24cc 100644
--- a/Makefile
+++ b/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\
diff --git a/src/capnp/FromStructReader.java b/src/capnp/FromStructReader.java
new file mode 100644
index 0000000..676acc8
--- /dev/null
+++ b/src/capnp/FromStructReader.java
@@ -0,0 +1,5 @@
+package capnp;
+
+public interface FromStructReader<T> {
+    public abstract T fromStructReader(StructReader reader);
+}
diff --git a/src/capnp/StructFactory.java b/src/capnp/StructFactory.java
deleted file mode 100644
index 15c041b..0000000
--- a/src/capnp/StructFactory.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package capnp;
-
-public interface StructFactory<T> {
-    public abstract T createFromStructReader(StructReader reader);
-}
diff --git a/src/capnp/StructList.java b/src/capnp/StructList.java
index 047b1b3..6035dfb 100644
--- a/src/capnp/StructList.java
+++ b/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.createFromStructReader(sr);
+            return this.factory.fromStructReader(this.reader.getStructElement(index));
         }
     }