diff options
author | 2014-08-07 22:22:00 +0000 | |
---|---|---|
committer | 2014-08-07 22:22:00 +0000 | |
commit | d7339318a33c5f9e8b5dded4077223fbd4ebf229 (patch) | |
tree | 89ecf7d50bebe7bccf6b7258279a8b1f964ecd76 /src/google/protobuf/compiler/java/java_shared_code_generator.cc | |
parent | 83964a9ab481a245274c6a13584df5038480037d (diff) |
Change java descriptor back to private
Diffstat (limited to 'src/google/protobuf/compiler/java/java_shared_code_generator.cc')
-rw-r--r-- | src/google/protobuf/compiler/java/java_shared_code_generator.cc | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/src/google/protobuf/compiler/java/java_shared_code_generator.cc b/src/google/protobuf/compiler/java/java_shared_code_generator.cc index e454a526..183b0ce6 100644 --- a/src/google/protobuf/compiler/java/java_shared_code_generator.cc +++ b/src/google/protobuf/compiler/java/java_shared_code_generator.cc @@ -176,37 +176,17 @@ void SharedCodeGenerator::GenerateDescriptors(io::Printer* printer) { // Invoke internalBuildGeneratedFileFrom() to build the file. printer->Print( "com.google.protobuf.Descriptors.FileDescriptor\n" - " .internalBuildGeneratedFileFrom(descriptorData,\n"); + " .internalBuildGeneratedFileFrom(descriptorData,\n" + " new com.google.protobuf.Descriptors.FileDescriptor[] {\n"); - printer->Print( - " $classname$.class,\n" - " new java.lang.String[] {\n", - "classname", name_resolver_->GetDescriptorClassName(file_)); for (int i = 0; i < dependencies.size(); i++) { const string& dependency = dependencies[i].second; printer->Print( - // Here we load the dependency FileDescriptors lazily via Java - // reflection. This is to avoid breaking proto1 targets who have - // genproto dependencies for which we can't generate the descriptor - // class. They will compile fine but when users try to call reflection - // functions upon them it will fail. Users will have to get rid of - // genproto dependencies before they can use proto2 reflection on - // proto1 messages. - " \"$dependency$\",\n", + " $dependency$.getDescriptor(),\n", "dependency", dependency); } printer->Print( - " }, new java.lang.String[] {\n"); - - for (int i = 0; i < dependencies.size(); i++) { - const string& filename = dependencies[i].first; - printer->Print( - " \"$filename$\",\n", - "filename", filename); - } - - printer->Print( " }, assigner);\n"); } |