diff options
| author | Wink Saville <wink@google.com> | 2013-10-09 08:59:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 08:59:38 -0700 |
| commit | 19e465df3d90da132a9bd0edb7825db959ee4689 (patch) | |
| tree | 081c0e79940af6dece20373d43c7b5dd4c047294 | |
| parent | ba1b8baf001eab9e89e70a4793efdd9b5ec71e76 (diff) | |
| parent | 1410c721d9c7ffa6b2e59524b55ae6498f8de8b9 (diff) | |
| download | protobuf-19e465df3d90da132a9bd0edb7825db959ee4689.tar.gz protobuf-19e465df3d90da132a9bd0edb7825db959ee4689.tar.bz2 protobuf-19e465df3d90da132a9bd0edb7825db959ee4689.zip | |
am 44cbb06c: Merge "Fix some indenting issues with set__() function"
* commit '44cbb06c725fbba00464bba9f19dc0ea295406b1':
Fix some indenting issues with set__() function
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_primitive_field.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc b/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc index 69664d30..fe6a48f8 100644 --- a/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc +++ b/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc @@ -281,14 +281,6 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor, const Params param (*variables)["tag"] = SimpleItoa(WireFormat::MakeTag(descriptor)); (*variables)["tag_size"] = SimpleItoa( WireFormat::TagSize(descriptor->number(), descriptor->type())); - if (IsReferenceType(GetJavaType(descriptor))) { - (*variables)["null_check"] = - " if (value == null) {\n" - " throw new java.lang.NullPointerException();\n" - " }\n"; - } else { - (*variables)["null_check"] = ""; - } int fixed_size = FixedSize(descriptor->type()); if (fixed_size != -1) { (*variables)["fixed_size"] = SimpleItoa(fixed_size); @@ -425,8 +417,12 @@ GenerateMembers(io::Printer* printer) const { "public $type$ get$capitalized_name$() {\n" " return $name$_;\n" "}\n" - "public void set$capitalized_name$($type$ value) {\n" - "$null_check$" + "public void set$capitalized_name$($type$ value) {\n"); + if (IsReferenceType(GetJavaType(descriptor_))) { + printer->Print(variables_, + " if (value == null) throw new java.lang.NullPointerException();\n"); + } + printer->Print(variables_, " $name$_ = value;\n" " $set_has$;\n" "}\n" |