diff --git a/runtime/src/main/java/org/capnproto/FromPointerBuilder.java b/runtime/src/main/java/org/capnproto/FromPointerBuilder.java index be4b382..8369334 100644 --- a/runtime/src/main/java/org/capnproto/FromPointerBuilder.java +++ b/runtime/src/main/java/org/capnproto/FromPointerBuilder.java @@ -1,9 +1,6 @@ package org.capnproto; public interface FromPointerBuilder { - T constructBuilder(SegmentBuilder segment, int ptr, - int elementCount, int step, - int structDataSize, short structPointerCount); T fromPointerBuilder(PointerBuilder builder, SegmentReader defaultSegment, int defaultOffset); T initFromPointerBuilder(PointerBuilder builder, int elementCount); } diff --git a/runtime/src/main/java/org/capnproto/FromPointerReader.java b/runtime/src/main/java/org/capnproto/FromPointerReader.java index 44fca8d..27cde66 100644 --- a/runtime/src/main/java/org/capnproto/FromPointerReader.java +++ b/runtime/src/main/java/org/capnproto/FromPointerReader.java @@ -1,10 +1,5 @@ package org.capnproto; public interface FromPointerReader { - T constructReader(SegmentReader segment, - int ptr, - int elementCount, int step, - int structDataSize, short structPointerCount, - int nestingLimit); T fromPointerReader(PointerReader reader, SegmentReader defaultSegment, int defaultOffset); } diff --git a/runtime/src/main/java/org/capnproto/ListBuilder.java b/runtime/src/main/java/org/capnproto/ListBuilder.java index 205938a..4e429b3 100644 --- a/runtime/src/main/java/org/capnproto/ListBuilder.java +++ b/runtime/src/main/java/org/capnproto/ListBuilder.java @@ -1,6 +1,12 @@ package org.capnproto; public class ListBuilder { + public interface Factory { + T constructBuilder(SegmentBuilder segment, int ptr, + int elementCount, int step, + int structDataSize, short structPointerCount); + } + final SegmentBuilder segment; final int ptr; // byte offset to front of list final int elementCount; diff --git a/runtime/src/main/java/org/capnproto/ListFactory.java b/runtime/src/main/java/org/capnproto/ListFactory.java index 70d7109..85cedea 100644 --- a/runtime/src/main/java/org/capnproto/ListFactory.java +++ b/runtime/src/main/java/org/capnproto/ListFactory.java @@ -1,5 +1,6 @@ package org.capnproto; -public interface ListFactory extends FromPointerBuilder, FromPointerReader { +public interface ListFactory extends ListBuilder.Factory, FromPointerBuilder, + ListReader.Factory, FromPointerReader { } diff --git a/runtime/src/main/java/org/capnproto/ListReader.java b/runtime/src/main/java/org/capnproto/ListReader.java index cebb68c..1d5143d 100644 --- a/runtime/src/main/java/org/capnproto/ListReader.java +++ b/runtime/src/main/java/org/capnproto/ListReader.java @@ -1,6 +1,14 @@ package org.capnproto; public class ListReader { + public interface Factory { + T constructReader(SegmentReader segment, + int ptr, + int elementCount, int step, + int structDataSize, short structPointerCount, + int nestingLimit); + } + final SegmentReader segment; final int ptr; // byte offset to front of list final int elementCount; diff --git a/runtime/src/main/java/org/capnproto/StructReader.java b/runtime/src/main/java/org/capnproto/StructReader.java index b5f02e3..7a1a775 100644 --- a/runtime/src/main/java/org/capnproto/StructReader.java +++ b/runtime/src/main/java/org/capnproto/StructReader.java @@ -2,7 +2,6 @@ package org.capnproto; public class StructReader { - public interface Factory { T constructReader(SegmentReader segment, int data, int pointers, int dataSize, short pointerCount, diff --git a/runtime/src/main/java/org/capnproto/WireHelpers.java b/runtime/src/main/java/org/capnproto/WireHelpers.java index b739c75..b594a93 100644 --- a/runtime/src/main/java/org/capnproto/WireHelpers.java +++ b/runtime/src/main/java/org/capnproto/WireHelpers.java @@ -188,7 +188,7 @@ final class WireHelpers { } - static T initListPointer(FromPointerBuilder factory, + static T initListPointer(ListBuilder.Factory factory, int refOffset, SegmentBuilder segment, int elementCount, @@ -208,7 +208,7 @@ final class WireHelpers { elementCount, step, dataSize, (short)pointerCount); } - static T initStructListPointer(FromPointerBuilder factory, + static T initStructListPointer(ListBuilder.Factory factory, int refOffset, SegmentBuilder segment, int elementCount, @@ -238,7 +238,7 @@ final class WireHelpers { elementSize.data * Constants.BITS_PER_WORD, elementSize.pointers); } - static T getWritableListPointer(FromPointerBuilder factory, + static T getWritableListPointer(ListBuilder.Factory factory, int origRefOffset, SegmentBuilder origSegment, byte elementSize, @@ -296,7 +296,7 @@ final class WireHelpers { } } - static T getWritableStructListPointer(FromPointerBuilder factory, + static T getWritableStructListPointer(ListBuilder.Factory factory, int origRefOffset, SegmentBuilder origSegment, StructSize elementSize, @@ -514,7 +514,7 @@ final class WireHelpers { throw new Error("copyPointer is unimplemented"); } - static T readListPointer(FromPointerReader factory, + static T readListPointer(ListReader.Factory factory, SegmentReader segment, int refOffset, SegmentReader defaultSegment,