From f76b59aeac2ce35e954c15c676e9102777ec8faa Mon Sep 17 00:00:00 2001
From: Christopher Wiley <wiley@google.com>
Date: Fri, 29 Jan 2016 11:32:11 -0800
Subject: Turn android::aidl::java::Document into a class

Bug: None
Test: Compiles, unit tests pass

Change-Id: I17db404bceb868d7f8ff5de5beea03fca222d7d8
---
 generate_java.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'generate_java.cpp')

diff --git a/generate_java.cpp b/generate_java.cpp
index d0e3947..14df353 100644
--- a/generate_java.cpp
+++ b/generate_java.cpp
@@ -16,6 +16,7 @@
 
 #include "generate_java.h"
 
+#include <memory>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -25,6 +26,7 @@
 #include "code_writer.h"
 #include "type_java.h"
 
+using std::unique_ptr;
 using ::android::aidl::java::Variable;
 using std::string;
 using android::base::StringPrintf;
@@ -57,12 +59,11 @@ int generate_java(const string& filename, const string& originalSrc,
                   const IoDelegate& io_delegate) {
   Class* cl = generate_binder_interface_class(iface, types);
 
-  Document* document = new Document;
-      document->comment = "";
-      if (!iface->GetPackage().empty())
-        document->package = iface->GetPackage();
-      document->originalSrc = originalSrc;
-      document->classes.push_back(cl);
+  Document* document = new Document(
+      "" /* no comment */,
+      (!iface->GetPackage().empty()) ? iface->GetPackage() : "",
+      originalSrc,
+      unique_ptr<Class>(cl));
 
   CodeWriterPtr code_writer = io_delegate.GetCodeWriter(filename);
   document->Write(code_writer.get());
-- 
cgit v1.2.3