From b45ee39cc46509d19159c5da014ae309a9ed8630 Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Sat, 10 May 2014 21:17:42 -0400 Subject: [PATCH] renaming --- Makefile | 4 ++-- examples/{Addressbook.java => AddressbookMain.java} | 2 +- src/compiler/capnpc-java.c++ | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) rename examples/{Addressbook.java => AddressbookMain.java} (95%) diff --git a/Makefile b/Makefile index 7662813..6bd2cc7 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,6 @@ capnpc-java : $(CAPNPC_JAVA_SOURCES) $(CXX) -I/usr/local/include -L/usr/local/lib -lkj -lcapnp $(CAPNPC_JAVA_SOURCES) -o capnpc-java -addressbook : capnp capnpc-java examples/Addressbook.java +addressbook : capnp capnpc-java examples/AddressbookMain.java capnp compile -o ./capnpc-java examples/addressbook.capnp - javac examples/Addressbook.java + javac examples/AddressbookMain.java diff --git a/examples/Addressbook.java b/examples/AddressbookMain.java similarity index 95% rename from examples/Addressbook.java rename to examples/AddressbookMain.java index 8770377..faf130e 100644 --- a/examples/Addressbook.java +++ b/examples/AddressbookMain.java @@ -1,4 +1,4 @@ -public class Addressbook { +public class AddressbookMain { public static void writeAddressBook() { System.out.println("writing addressbook ..."); diff --git a/src/compiler/capnpc-java.c++ b/src/compiler/capnpc-java.c++ index dda0117..312cf48 100644 --- a/src/compiler/capnpc-java.c++ +++ b/src/compiler/capnpc-java.c++ @@ -1492,6 +1492,9 @@ private: } } + auto filename = request.getFilename(); + // filename.findLast( + auto nodeTexts = KJ_MAP(nested, node.getNestedNodes()) { return makeNodeText(namespacePrefix, "", nested.getName(), schemaLoader.get(nested.getId()), 1); };