diff options
| author |  liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2011-04-08 03:40:29 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2011-04-08 03:40:29 +0000 |
| commit | 9cf65b7dd29adfb849b555eee3e3b93d7c45fc73 (patch) | |
| tree | 745bb0ccdab975170c144651eb91d6cd0a3b976d /src/google/protobuf/compiler/java/java_string_field.cc | |
| parent | eab9b5d47faf6c9611be323f4354f9548f6e378a (diff) | |
Use fully qualified java.lang.Object in protoc java code.
Diffstat (limited to 'src/google/protobuf/compiler/java/java_string_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_string_field.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/google/protobuf/compiler/java/java_string_field.cc b/src/google/protobuf/compiler/java/java_string_field.cc index a93ff434..4f1fb14c 100644 --- a/src/google/protobuf/compiler/java/java_string_field.cc +++ b/src/google/protobuf/compiler/java/java_string_field.cc @@ -168,14 +168,14 @@ GenerateInterfaceMembers(io::Printer* printer) const { void StringFieldGenerator:: GenerateMembers(io::Printer* printer) const { printer->Print(variables_, - "private Object $name$_;\n" + "private java.lang.Object $name$_;\n" "$deprecation$public boolean has$capitalized_name$() {\n" " return $get_has_field_bit_message$;\n" "}\n"); printer->Print(variables_, "$deprecation$public String get$capitalized_name$() {\n" - " Object ref = $name$_;\n" + " java.lang.Object ref = $name$_;\n" " if (ref instanceof String) {\n" " return (String) ref;\n" " } else {\n" @@ -189,7 +189,7 @@ GenerateMembers(io::Printer* printer) const { " }\n" "}\n" "private com.google.protobuf.ByteString get$capitalized_name$Bytes() {\n" - " Object ref = $name$_;\n" + " java.lang.Object ref = $name$_;\n" " if (ref instanceof String) {\n" " com.google.protobuf.ByteString b = \n" " com.google.protobuf.ByteString.copyFromUtf8((String) ref);\n" @@ -204,14 +204,14 @@ GenerateMembers(io::Printer* printer) const { void StringFieldGenerator:: GenerateBuilderMembers(io::Printer* printer) const { printer->Print(variables_, - "private Object $name$_ $default_init$;\n" + "private java.lang.Object $name$_ $default_init$;\n" "$deprecation$public boolean has$capitalized_name$() {\n" " return $get_has_field_bit_builder$;\n" "}\n"); printer->Print(variables_, "$deprecation$public String get$capitalized_name$() {\n" - " Object ref = $name$_;\n" + " java.lang.Object ref = $name$_;\n" " if (!(ref instanceof String)) {\n" " String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();\n" " $name$_ = s;\n" |