diff options
| author | Max Cai <maxtroy@google.com> | 2013-10-16 18:02:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-16 18:02:22 +0000 |
| commit | 42be1e79ccd670be36220222936aa7cacc6856f6 (patch) | |
| tree | 5efc9c514a88a8f0268bafc468c5742e9ec63461 /src/google/protobuf/compiler/javanano/javanano_message_field.cc | |
| parent | c50f605c572a425b2fa696fedc5e61ac6f66d2a9 (diff) | |
| parent | b15a1b379f896e371ca3375bdf51dd4a9a0268af (diff) | |
| download | external_protobuf-42be1e79ccd670be36220222936aa7cacc6856f6.zip external_protobuf-42be1e79ccd670be36220222936aa7cacc6856f6.tar.gz external_protobuf-42be1e79ccd670be36220222936aa7cacc6856f6.tar.bz2 | |
Merge "Feature request: set() and clear() accessors return this"
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_message_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_message_field.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message_field.cc b/src/google/protobuf/compiler/javanano/javanano_message_field.cc index 225cf42..02253f9 100644 --- a/src/google/protobuf/compiler/javanano/javanano_message_field.cc +++ b/src/google/protobuf/compiler/javanano/javanano_message_field.cc @@ -148,17 +148,19 @@ GenerateMembers(io::Printer* printer) const { "public $type$ get$capitalized_name$() {\n" " return $name$_;\n" "}\n" - "public void set$capitalized_name$($type$ value) {\n" + "public $message_name$ set$capitalized_name$($type$ value) {\n" " if (value == null) {\n" " throw new java.lang.NullPointerException();\n" " }\n" " $name$_ = value;\n" + " return this;\n" "}\n" "public boolean has$capitalized_name$() {\n" " return $name$_ != null;\n" "}\n" - "public void clear$capitalized_name$() {\n" + "public $message_name$ clear$capitalized_name$() {\n" " $name$_ = null;\n" + " return this;" "}\n"); } @@ -171,8 +173,8 @@ GenerateClearCode(io::Printer* printer) const { void AccessorMessageFieldGenerator:: GenerateMergingCode(io::Printer* printer) const { printer->Print(variables_, - "if (!has$capitalized_name$()) {\n" - " set$capitalized_name$(new $type$());\n" + "if ($name$_ == null) {\n" + " $name$_ = new $type$();\n" "}\n"); if (descriptor_->type() == FieldDescriptor::TYPE_GROUP) { @@ -187,7 +189,7 @@ GenerateMergingCode(io::Printer* printer) const { void AccessorMessageFieldGenerator:: GenerateSerializationCode(io::Printer* printer) const { printer->Print(variables_, - "if (has$capitalized_name$()) {\n" + "if ($name$_ != null) {\n" " output.write$group_or_message$($number$, $name$_);\n" "}\n"); } @@ -195,7 +197,7 @@ GenerateSerializationCode(io::Printer* printer) const { void AccessorMessageFieldGenerator:: GenerateSerializedSizeCode(io::Printer* printer) const { printer->Print(variables_, - "if (has$capitalized_name$()) {\n" + "if ($name$_ != null) {\n" " size += com.google.protobuf.nano.CodedOutputByteBufferNano\n" " .compute$group_or_message$Size($number$, $name$_);\n" "}\n"); |