Skip to content

P
protobuf
Commit aea43743 authored by lundefugl's avatar lundefugl
Browse files
Options

Issue 3112: Object class with fully qualified name

parent 40da1ed5
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/google/protobuf/compiler/java/java_message_builder.cc
View file @ aea43743
...@@ -472,7 +472,7 @@ GenerateCommonBuilderMethods(io::Printer* printer) { ...@@ -472,7 +472,7 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
"}\n" "}\n"
"public Builder setField(\n" "public Builder setField(\n"
" com.google.protobuf.Descriptors.FieldDescriptor field,\n" " com.google.protobuf.Descriptors.FieldDescriptor field,\n"
" Object value) {\n" " java.lang.Object value) {\n"
" return (Builder) super.setField(field, value);\n" " return (Builder) super.setField(field, value);\n"
"}\n" "}\n"
"public Builder clearField(\n" "public Builder clearField(\n"
...@@ -485,12 +485,12 @@ GenerateCommonBuilderMethods(io::Printer* printer) { ...@@ -485,12 +485,12 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
"}\n" "}\n"
"public Builder setRepeatedField(\n" "public Builder setRepeatedField(\n"
" com.google.protobuf.Descriptors.FieldDescriptor field,\n" " com.google.protobuf.Descriptors.FieldDescriptor field,\n"
" int index, Object value) {\n" " int index, java.lang.Object value) {\n"
" return (Builder) super.setRepeatedField(field, index, value);\n" " return (Builder) super.setRepeatedField(field, index, value);\n"
"}\n" "}\n"
"public Builder addRepeatedField(\n" "public Builder addRepeatedField(\n"
" com.google.protobuf.Descriptors.FieldDescriptor field,\n" " com.google.protobuf.Descriptors.FieldDescriptor field,\n"
" Object value) {\n" " java.lang.Object value) {\n"
" return (Builder) super.addRepeatedField(field, value);\n" " return (Builder) super.addRepeatedField(field, value);\n"
"}\n"); "}\n");
......
src/google/protobuf/compiler/java/java_message_lite.cc
View file @ aea43743
...@@ -346,9 +346,9 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) { ...@@ -346,9 +346,9 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
printer->Print( printer->Print(
"@java.lang.SuppressWarnings({\"unchecked\", \"fallthrough\"})\n" "@java.lang.SuppressWarnings({\"unchecked\", \"fallthrough\"})\n"
"protected final Object dynamicMethod(\n" "protected final java.lang.Object dynamicMethod(\n"
" com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,\n" " com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,\n"
" Object arg0, Object arg1) {\n" " java.lang.Object arg0, java.lang.Object arg1) {\n"
" switch (method) {\n" " switch (method) {\n"
" case NEW_MUTABLE_INSTANCE: {\n" " case NEW_MUTABLE_INSTANCE: {\n"
" return new $classname$();\n" " return new $classname$();\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment