From ecc7c55a6e04f4fbccf424fb54a2e9ee35f30acd Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Sat, 10 May 2014 21:42:23 -0400
Subject: [PATCH] some bug fixes

---
 src/compiler/capnpc-java.c++ | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/compiler/capnpc-java.c++ b/src/compiler/capnpc-java.c++
index eeac22c..3aa247e 100644
--- a/src/compiler/capnpc-java.c++
+++ b/src/compiler/capnpc-java.c++
@@ -42,8 +42,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <string>
-
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -167,7 +165,7 @@ kj::String safeIdentifier(kj::StringPtr identifier) {
 }
 
   kj::String spaces(int n) {
-    return kj::str(std::string(n * 2, ' '));
+    return kj::str(kj::repeat(' ', n * 2));
   }
 
 // =======================================================================================
@@ -918,11 +916,11 @@ private:
             spaces(indent), "  public ", type, ".Reader get", titleCase, "() {\n",
             (kind == FieldKind::LIST ?
              kj::strTree(spaces(indent),
-                         "    return new ", type, ".Reader.new(_reader.getPointerField(",
+                         "    return new ", type, ".Reader(_reader.getPointerField(",
                          offset, ").getList(), ", elementReaderType, ".factory);\n") :
              (kind == FieldKind::BLOB ?
               kj::strTree(spaces(indent), "    return _reader.getPointerField(",
-                          offset,".getText());\n") :
+                          offset,").getText();\n") :
               kj::strTree(spaces(indent), "Struct\n"))),  // XXX
             spaces(indent), "  }\n",
             "\n"),
@@ -1515,9 +1513,9 @@ private:
     return FileText {
       kj::strTree(
           "// Generated by Cap'n Proto compiler, DO NOT EDIT\n"
-          "// source: ", baseName(displayName), "\n"
-          "\n"
-          "import capnp;\n",
+          "// source: ", baseName(displayName), "\n",
+          "\n",
+          //"import capnp;\n",
           hasInterfaces ? kj::strTree("#include <capnp/capability.h>\n") : kj::strTree(),
           "\n",
           KJ_MAP(path, includes) {