diff options
author | Wink Saville <wink@google.com> | 2013-08-07 19:57:30 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-07 19:57:30 +0000 |
commit | e7b778b99f607460ed9ea88a13ec91164cda8537 (patch) | |
tree | f7d79f8de4666a66a09928fbc3468516b1c4ec76 /src/google/protobuf/compiler/javanano/javanano_generator.cc | |
parent | 87c8e31b8c0baa78f979863a9ed10654a1cdca1f (diff) | |
parent | 624c448fbef20a1a2fad2289f622b468c25763d1 (diff) | |
download | external_protobuf-e7b778b99f607460ed9ea88a13ec91164cda8537.zip external_protobuf-e7b778b99f607460ed9ea88a13ec91164cda8537.tar.gz external_protobuf-e7b778b99f607460ed9ea88a13ec91164cda8537.tar.bz2 |
Merge "Fix outer classname for javamicro/javanano."
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_generator.cc')
-rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_generator.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_generator.cc b/src/google/protobuf/compiler/javanano/javanano_generator.cc index 76e7263..5bed1b1 100644 --- a/src/google/protobuf/compiler/javanano/javanano_generator.cc +++ b/src/google/protobuf/compiler/javanano/javanano_generator.cc @@ -138,16 +138,18 @@ bool JavaNanoGenerator::Generate(const FileDescriptor* file, vector<string> all_files; - string java_filename = package_dir; - java_filename += file_generator.classname(); - java_filename += ".java"; - all_files.push_back(java_filename); - - // Generate main java file. - scoped_ptr<io::ZeroCopyOutputStream> output( - output_directory->Open(java_filename)); - io::Printer printer(output.get(), '$'); - file_generator.Generate(&printer); + if (IsOuterClassNeeded(params, file)) { + string java_filename = package_dir; + java_filename += file_generator.classname(); + java_filename += ".java"; + all_files.push_back(java_filename); + + // Generate main java file. + scoped_ptr<io::ZeroCopyOutputStream> output( + output_directory->Open(java_filename)); + io::Printer printer(output.get(), '$'); + file_generator.Generate(&printer); + } // Generate sibling files. file_generator.GenerateSiblings(package_dir, output_directory, &all_files); |