diff options
| author | Max Cai <maxtroy@google.com> | 2013-10-16 15:11:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-16 15:11:27 +0000 |
| commit | c50f605c572a425b2fa696fedc5e61ac6f66d2a9 (patch) | |
| tree | ee56a3bbe964262907ea8304307ba163baf589a5 /src/google/protobuf/compiler/javanano/javanano_enum_field.cc | |
| parent | afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc (diff) | |
| parent | 286271f75aa6ff1f3746379b77d6dc55415baa16 (diff) | |
| download | external_protobuf-c50f605c572a425b2fa696fedc5e61ac6f66d2a9.zip external_protobuf-c50f605c572a425b2fa696fedc5e61ac6f66d2a9.tar.gz external_protobuf-c50f605c572a425b2fa696fedc5e61ac6f66d2a9.tar.bz2 | |
Merge "Make generated code more aligned with Google Java style."
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_enum_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_enum_field.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc index fe67d76..4366161 100644 --- a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc +++ b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc @@ -111,11 +111,11 @@ GenerateClearCode(io::Printer* printer) const { void EnumFieldGenerator:: GenerateMergingCode(io::Printer* printer) const { printer->Print(variables_, - " this.$name$ = input.readInt32();\n"); + "this.$name$ = input.readInt32();\n"); if (params_.generate_has()) { printer->Print(variables_, - " has$capitalized_name$ = true;\n"); + "has$capitalized_name$ = true;\n"); } } @@ -281,8 +281,8 @@ GenerateMergingCode(io::Printer* printer) const { "input.popLimit(limit);\n"); } else { printer->Print(variables_, - "int arrayLength = com.google.protobuf.nano.WireFormatNano.\n" - " getRepeatedFieldArrayLength(input, $tag$);\n" + "int arrayLength = com.google.protobuf.nano.WireFormatNano\n" + " .getRepeatedFieldArrayLength(input, $tag$);\n" "int i = this.$name$ == null ? 0 : this.$name$.length;\n" "int[] newArray = new int[i + arrayLength];\n" "if (i != 0) {\n" |