diff --git a/Makefile b/Makefile index be5e6c4..c92e9b4 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ CAPNP_SOURCES=\ src/capnp/WirePointer.java\ src/capnp/WordPointer.java -CAPNP_COMPILATION_MARKER=capnp/PointerReader.class +CAPNP_COMPILATION_MARKER=org/capnproto/PointerReader.class CAPNPC_JAVA_SOURCES=src/compiler/capnpc-java.c++ @@ -27,11 +27,11 @@ CAPNPC_JAVA_SOURCES=src/compiler/capnpc-java.c++ all : capnpc-java addressbook capnp clean : - rm -rf capnpc-java capnp examples/*.class + rm -rf capnpc-java org examples/*.class capnp : $(CAPNP_COMPILATION_MARKER) -capnp/PointerReader.class : $(CAPNP_SOURCES) +$(CAPNP_COMPILATION_MARKER) : $(CAPNP_SOURCES) javac -d . $(CAPNP_SOURCES) capnpc-java : $(CAPNPC_JAVA_SOURCES) diff --git a/examples/AddressbookMain.java b/examples/AddressbookMain.java index bb41c29..9d4ecb7 100644 --- a/examples/AddressbookMain.java +++ b/examples/AddressbookMain.java @@ -1,3 +1,6 @@ +import org.capnproto.MessageReader; +import org.capnproto.StructList; +import org.capnproto.InputStreamMessageReader; public class AddressbookMain { @@ -6,15 +9,15 @@ public class AddressbookMain { } public static void printAddressBook() throws java.io.IOException { - capnp.MessageReader message = capnp.InputStreamMessageReader.create(System.in); + MessageReader message = InputStreamMessageReader.create(System.in); Addressbook.AddressBook.Reader addressbook = message.getRoot(Addressbook.AddressBook.Reader.factory); - capnp.StructList.Reader people = addressbook.getPeople(); + StructList.Reader people = addressbook.getPeople(); int size = people.size(); for(int ii = 0; ii < size; ++ii) { Addressbook.Person.Reader person = people.get(ii); System.out.println(person.getName().toString() + ": " + person.getEmail().toString()); - capnp.StructList.Reader phones = person.getPhones(); + StructList.Reader phones = person.getPhones(); for (int jj = 0; jj < phones.size(); ++jj) { Addressbook.Person.PhoneNumber.Reader phone = phones.get(jj); String typeName = "UNKNOWN"; diff --git a/src/capnp/AnyPointer.java b/src/capnp/AnyPointer.java index 37fc2a0..26346e8 100644 --- a/src/capnp/AnyPointer.java +++ b/src/capnp/AnyPointer.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; public class AnyPointer { diff --git a/src/capnp/FieldSize.java b/src/capnp/FieldSize.java index 8434c80..52886ad 100644 --- a/src/capnp/FieldSize.java +++ b/src/capnp/FieldSize.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; public class FieldSize { public static final byte VOID = 0; diff --git a/src/capnp/FromStructReader.java b/src/capnp/FromStructReader.java index 676acc8..eaf1413 100644 --- a/src/capnp/FromStructReader.java +++ b/src/capnp/FromStructReader.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; public interface FromStructReader { public abstract T fromStructReader(StructReader reader); diff --git a/src/capnp/InputStreamMessageReader.java b/src/capnp/InputStreamMessageReader.java index 489a1f5..ff3d3f6 100644 --- a/src/capnp/InputStreamMessageReader.java +++ b/src/capnp/InputStreamMessageReader.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; import java.io.InputStream; import java.io.IOException; diff --git a/src/capnp/ListPointer.java b/src/capnp/ListPointer.java index 272981b..37c984e 100644 --- a/src/capnp/ListPointer.java +++ b/src/capnp/ListPointer.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; import java.nio.ByteBuffer; diff --git a/src/capnp/ListReader.java b/src/capnp/ListReader.java index 7c26b90..4c019f9 100644 --- a/src/capnp/ListReader.java +++ b/src/capnp/ListReader.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; public class ListReader { SegmentReader segment; diff --git a/src/capnp/MessageReader.java b/src/capnp/MessageReader.java index 2d1fa17..1337184 100644 --- a/src/capnp/MessageReader.java +++ b/src/capnp/MessageReader.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; import java.nio.ByteBuffer; diff --git a/src/capnp/PointerReader.java b/src/capnp/PointerReader.java index 3f21b33..9083360 100644 --- a/src/capnp/PointerReader.java +++ b/src/capnp/PointerReader.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; public class PointerReader { public SegmentReader segment; diff --git a/src/capnp/SegmentReader.java b/src/capnp/SegmentReader.java index a9c6d9f..891592d 100644 --- a/src/capnp/SegmentReader.java +++ b/src/capnp/SegmentReader.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; import java.nio.ByteBuffer; diff --git a/src/capnp/StructList.java b/src/capnp/StructList.java index 6035dfb..197724a 100644 --- a/src/capnp/StructList.java +++ b/src/capnp/StructList.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; public class StructList { diff --git a/src/capnp/StructPointer.java b/src/capnp/StructPointer.java index 9cdf5b0..26c8b7f 100644 --- a/src/capnp/StructPointer.java +++ b/src/capnp/StructPointer.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; import java.nio.ByteBuffer; diff --git a/src/capnp/StructReader.java b/src/capnp/StructReader.java index 1c685e1..bc0229b 100644 --- a/src/capnp/StructReader.java +++ b/src/capnp/StructReader.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; public class StructReader { public SegmentReader segment; diff --git a/src/capnp/Text.java b/src/capnp/Text.java index dcab278..00a14c0 100644 --- a/src/capnp/Text.java +++ b/src/capnp/Text.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; import java.nio.ByteBuffer; diff --git a/src/capnp/WireHelpers.java b/src/capnp/WireHelpers.java index 55a3ab8..fd95341 100644 --- a/src/capnp/WireHelpers.java +++ b/src/capnp/WireHelpers.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; class WireHelpers { diff --git a/src/capnp/WirePointer.java b/src/capnp/WirePointer.java index 95f007e..5437759 100644 --- a/src/capnp/WirePointer.java +++ b/src/capnp/WirePointer.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; import java.nio.ByteBuffer; diff --git a/src/capnp/WordPointer.java b/src/capnp/WordPointer.java index 8b389a5..8ba7f20 100644 --- a/src/capnp/WordPointer.java +++ b/src/capnp/WordPointer.java @@ -1,4 +1,4 @@ -package capnp; +package org.capnproto; import java.nio.ByteBuffer; diff --git a/src/capnp/layout.java b/src/capnp/layout.java index 5a3a638..d8da6a5 100644 --- a/src/capnp/layout.java +++ b/src/capnp/layout.java @@ -1,3 +1,3 @@ -package capnp; +package org.capnproto; diff --git a/src/compiler/capnpc-java.c++ b/src/compiler/capnpc-java.c++ index 3218507..853a795 100644 --- a/src/compiler/capnpc-java.c++ +++ b/src/compiler/capnpc-java.c++ @@ -260,8 +260,8 @@ private: case schema::Type::FLOAT32: return kj::strTree("float"); case schema::Type::FLOAT64: return kj::strTree("double"); - case schema::Type::TEXT: return kj::strTree(" capnp.Text"); - case schema::Type::DATA: return kj::strTree(" capnp.Data"); + case schema::Type::TEXT: return kj::strTree(" org.capnproto.Text"); + case schema::Type::DATA: return kj::strTree(" org.capnproto.Data"); case schema::Type::ENUM: return javaFullName(schemaLoader.get(type.getEnum().getTypeId())); @@ -272,7 +272,7 @@ private: case schema::Type::LIST: // XXX - return kj::strTree(" capnp.StructList"); + return kj::strTree(" org.capnproto.StructList"); case schema::Type::ANY_POINTER: // Not used. @@ -929,7 +929,7 @@ private: " return new ", type, ".Reader<", elementReaderType, ">(_reader.getPointerField(", - offset, ").getList(capnp.FieldSize.INLINE_COMPOSITE), ", elementReaderType, ".factory);\n") : + offset, ").getList(org.capnproto.FieldSize.INLINE_COMPOSITE), ", elementReaderType, ".factory);\n") : (kind == FieldKind::BLOB ? kj::strTree(spaces(indent), " return _reader.getPointerField(", offset,").getText();\n") : @@ -1043,13 +1043,14 @@ private: int indent) { return kj::strTree(spaces(indent), "public static class Reader {\n", spaces(indent), - " public static class Factory implements capnp.FromStructReader {\n", - spaces(indent), " public Reader fromStructReader(capnp.StructReader reader) {\n", + " public static class Factory implements org.capnproto.FromStructReader {\n", + spaces(indent), + " public Reader fromStructReader(org.capnproto.StructReader reader) {\n", spaces(indent), " return new Reader(reader);\n", spaces(indent), " }\n", spaces(indent), " }\n", spaces(indent), " public static final Factory factory = new Factory();\n", - spaces(indent), " public Reader(capnp.StructReader base){ this._reader = base; }\n", + spaces(indent), " public Reader(org.capnproto.StructReader base){ this._reader = base; }\n", "\n", (isUnion ? kj::strTree(spaces(indent), " public Which which() {\n", @@ -1058,7 +1059,7 @@ private: spaces(indent), " }\n") : kj::strTree()), kj::mv(methodDecls), - spaces(indent), " public capnp.StructReader _reader;\n", + spaces(indent), " public org.capnproto.StructReader _reader;\n", spaces(indent), "}\n" "\n"); } @@ -1521,7 +1522,7 @@ private: "// Generated by Cap'n Proto compiler, DO NOT EDIT\n" "// source: ", baseName(displayName), "\n", "\n", - //"import capnp;\n", + //"import org.capnproto;\n", // KJ_MAP(n, namespaceParts) { return kj::strTree("namespace ", n, " {\n"); }, "\n", "public class ", outerClassName, " {\n", KJ_MAP(n, nodeTexts) { return kj::mv(n.outerTypeDef); },