AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

am 44cbb06c: Merge "Fix some indenting issues with set__() function"

Browse Source 
* commit '44cbb06c725fbba00464bba9f19dc0ea295406b1':
  Fix some indenting issues with set__() function
This commit is contained in:
Wink Saville 2013-10-09 08:59:38 -07:00 committed by Android Git Automerger
commit 19e465df3d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/google/protobuf/compiler/javanano/javanano_primitive_field.cc
View File

@ -281,14 +281,6 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor, const Params param
(*variables)["tag"] = SimpleItoa(WireFormat::MakeTag(descriptor)); (*variables)["tag"] = SimpleItoa(WireFormat::MakeTag(descriptor));
(*variables)["tag_size"] = SimpleItoa( (*variables)["tag_size"] = SimpleItoa(
WireFormat::TagSize(descriptor->number(), descriptor->type())); 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()); int fixed_size = FixedSize(descriptor->type());
if (fixed_size != -1) { if (fixed_size != -1) {
(*variables)["fixed_size"] = SimpleItoa(fixed_size); (*variables)["fixed_size"] = SimpleItoa(fixed_size);
@ -425,8 +417,12 @@ GenerateMembers(io::Printer* printer) const {
"public $type$ get$capitalized_name$() {\n" "public $type$ get$capitalized_name$() {\n"
" return $name$_;\n" " return $name$_;\n"
"}\n" "}\n"
"public void set$capitalized_name$($type$ value) {\n" "public void set$capitalized_name$($type$ value) {\n");
"$null_check$" if (IsReferenceType(GetJavaType(descriptor_))) {
printer->Print(variables_,
" if (value == null) throw new java.lang.NullPointerException();\n");
}
printer->Print(variables_,
" $name$_ = value;\n" " $name$_ = value;\n"
" $set_has$;\n" " $set_has$;\n"
"}\n" "}\n"