From 89f060c8af2d5a7eeec987a80de8b61eb6eda5d7 Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Sun, 11 May 2014 13:49:50 -0400
Subject: [PATCH] some cleanup

---
 Makefile                     |  2 +-
 src/compiler/capnpc-java.c++ | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index fd68738..be5e6c4 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ CAPNPC_JAVA_SOURCES=src/compiler/capnpc-java.c++
 all : capnpc-java addressbook capnp
 
 clean :
-	rm -rf capnpc-java capnp
+	rm -rf capnpc-java capnp examples/*.class
 
 capnp : $(CAPNP_COMPILATION_MARKER)
 
diff --git a/src/compiler/capnpc-java.c++ b/src/compiler/capnpc-java.c++
index 79e7196..3218507 100644
--- a/src/compiler/capnpc-java.c++
+++ b/src/compiler/capnpc-java.c++
@@ -1464,7 +1464,6 @@ private:
   // -----------------------------------------------------------------
 
   struct FileText {
-    kj::StringTree header;
     kj::StringTree source;
   };
 
@@ -1523,24 +1522,10 @@ private:
           "// source: ", baseName(displayName), "\n",
           "\n",
           //"import capnp;\n",
-          hasInterfaces ? kj::strTree("#include <capnp/capability.h>\n") : kj::strTree(),
-          "\n",
-          KJ_MAP(path, includes) {
-            if (path.startsWith("/")) {
-              return kj::strTree("#include <", path.slice(1), ".h>\n");
-            } else {
-              return kj::strTree("#include \"", path, ".h\"\n");
-            }
-          },
-          "\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); },
-          KJ_MAP(n, namespaceParts) { return kj::strTree("}\n"); }, "\n"),
-
-
-        kj::strTree()
+          KJ_MAP(n, namespaceParts) { return kj::strTree("}\n"); }, "\n")
     };
   }
 
@@ -1609,8 +1594,7 @@ private:
 
       auto fileText = makeFileText(schema, requestedFile);
 
-      writeFile(genFileName, fileText.header);
-      //      writeFile(kj::str(schema.getProto().getDisplayName(), ".c++"), fileText.source);
+      writeFile(genFileName, fileText.source);
     }
 
     return true;