Changeset 30737 in osm for applications/editors/josm/plugins/pbf/gen/com
- Timestamp:
- 2014-10-18T23:07:52+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/pbf/gen/com/google/protobuf/DescriptorProtos.java
r30658 r30737 96 96 case 10: { 97 97 if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { 98 file_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.FileDescriptorProto>();98 file_ = new java.util.ArrayList<>(); 99 99 mutable_bitField0_ |= 0x00000001; 100 100 } … … 460 460 private void ensureFileIsMutable() { 461 461 if (!((bitField0_ & 0x00000001) == 0x00000001)) { 462 file_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.FileDescriptorProto>(file_);462 file_ = new java.util.ArrayList<>(file_); 463 463 bitField0_ |= 0x00000001; 464 464 } … … 685 685 getFileFieldBuilder() { 686 686 if (fileBuilder_ == null) { 687 fileBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 688 com.google.protobuf.DescriptorProtos.FileDescriptorProto, com.google.protobuf.DescriptorProtos.FileDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder>( 687 fileBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 689 688 file_, 690 689 ((bitField0_ & 0x00000001) == 0x00000001), … … 1093 1092 case 34: { 1094 1093 if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { 1095 messageType_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.DescriptorProto>();1094 messageType_ = new java.util.ArrayList<>(); 1096 1095 mutable_bitField0_ |= 0x00000020; 1097 1096 } … … 1101 1100 case 42: { 1102 1101 if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { 1103 enumType_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.EnumDescriptorProto>();1102 enumType_ = new java.util.ArrayList<>(); 1104 1103 mutable_bitField0_ |= 0x00000040; 1105 1104 } … … 1109 1108 case 50: { 1110 1109 if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { 1111 service_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.ServiceDescriptorProto>();1110 service_ = new java.util.ArrayList<>(); 1112 1111 mutable_bitField0_ |= 0x00000080; 1113 1112 } … … 1117 1116 case 58: { 1118 1117 if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { 1119 extension_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.FieldDescriptorProto>();1118 extension_ = new java.util.ArrayList<>(); 1120 1119 mutable_bitField0_ |= 0x00000100; 1121 1120 } … … 1151 1150 case 80: { 1152 1151 if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { 1153 publicDependency_ = new java.util.ArrayList< java.lang.Integer>();1152 publicDependency_ = new java.util.ArrayList<>(); 1154 1153 mutable_bitField0_ |= 0x00000008; 1155 1154 } … … 1161 1160 int limit = input.pushLimit(length); 1162 1161 if (!((mutable_bitField0_ & 0x00000008) == 0x00000008) && input.getBytesUntilLimit() > 0) { 1163 publicDependency_ = new java.util.ArrayList< java.lang.Integer>();1162 publicDependency_ = new java.util.ArrayList<>(); 1164 1163 mutable_bitField0_ |= 0x00000008; 1165 1164 } … … 1172 1171 case 88: { 1173 1172 if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { 1174 weakDependency_ = new java.util.ArrayList< java.lang.Integer>();1173 weakDependency_ = new java.util.ArrayList<>(); 1175 1174 mutable_bitField0_ |= 0x00000010; 1176 1175 } … … 1182 1181 int limit = input.pushLimit(length); 1183 1182 if (!((mutable_bitField0_ & 0x00000010) == 0x00000010) && input.getBytesUntilLimit() > 0) { 1184 weakDependency_ = new java.util.ArrayList< java.lang.Integer>();1183 weakDependency_ = new java.util.ArrayList<>(); 1185 1184 mutable_bitField0_ |= 0x00000010; 1186 1185 } … … 2687 2686 private void ensurePublicDependencyIsMutable() { 2688 2687 if (!((bitField0_ & 0x00000008) == 0x00000008)) { 2689 publicDependency_ = new java.util.ArrayList< java.lang.Integer>(publicDependency_);2688 publicDependency_ = new java.util.ArrayList<>(publicDependency_); 2690 2689 bitField0_ |= 0x00000008; 2691 2690 } … … 2781 2780 private void ensureWeakDependencyIsMutable() { 2782 2781 if (!((bitField0_ & 0x00000010) == 0x00000010)) { 2783 weakDependency_ = new java.util.ArrayList< java.lang.Integer>(weakDependency_);2782 weakDependency_ = new java.util.ArrayList<>(weakDependency_); 2784 2783 bitField0_ |= 0x00000010; 2785 2784 } … … 2883 2882 private void ensureMessageTypeIsMutable() { 2884 2883 if (!((bitField0_ & 0x00000020) == 0x00000020)) { 2885 messageType_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.DescriptorProto>(messageType_);2884 messageType_ = new java.util.ArrayList<>(messageType_); 2886 2885 bitField0_ |= 0x00000020; 2887 2886 } … … 3180 3179 getMessageTypeFieldBuilder() { 3181 3180 if (messageTypeBuilder_ == null) { 3182 messageTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 3183 com.google.protobuf.DescriptorProtos.DescriptorProto, com.google.protobuf.DescriptorProtos.DescriptorProto.Builder, com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder>( 3181 messageTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 3184 3182 messageType_, 3185 3183 ((bitField0_ & 0x00000020) == 0x00000020), … … 3195 3193 private void ensureEnumTypeIsMutable() { 3196 3194 if (!((bitField0_ & 0x00000040) == 0x00000040)) { 3197 enumType_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.EnumDescriptorProto>(enumType_);3195 enumType_ = new java.util.ArrayList<>(enumType_); 3198 3196 bitField0_ |= 0x00000040; 3199 3197 } … … 3420 3418 getEnumTypeFieldBuilder() { 3421 3419 if (enumTypeBuilder_ == null) { 3422 enumTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 3423 com.google.protobuf.DescriptorProtos.EnumDescriptorProto, com.google.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder>( 3420 enumTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 3424 3421 enumType_, 3425 3422 ((bitField0_ & 0x00000040) == 0x00000040), … … 3435 3432 private void ensureServiceIsMutable() { 3436 3433 if (!((bitField0_ & 0x00000080) == 0x00000080)) { 3437 service_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.ServiceDescriptorProto>(service_);3434 service_ = new java.util.ArrayList<>(service_); 3438 3435 bitField0_ |= 0x00000080; 3439 3436 } … … 3660 3657 getServiceFieldBuilder() { 3661 3658 if (serviceBuilder_ == null) { 3662 serviceBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 3663 com.google.protobuf.DescriptorProtos.ServiceDescriptorProto, com.google.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder>( 3659 serviceBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 3664 3660 service_, 3665 3661 ((bitField0_ & 0x00000080) == 0x00000080), … … 3675 3671 private void ensureExtensionIsMutable() { 3676 3672 if (!((bitField0_ & 0x00000100) == 0x00000100)) { 3677 extension_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.FieldDescriptorProto>(extension_);3673 extension_ = new java.util.ArrayList<>(extension_); 3678 3674 bitField0_ |= 0x00000100; 3679 3675 } … … 3900 3896 getExtensionFieldBuilder() { 3901 3897 if (extensionBuilder_ == null) { 3902 extensionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 3903 com.google.protobuf.DescriptorProtos.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder>( 3898 extensionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 3904 3899 extension_, 3905 3900 ((bitField0_ & 0x00000100) == 0x00000100), … … 4017 4012 getOptionsFieldBuilder() { 4018 4013 if (optionsBuilder_ == null) { 4019 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder< 4020 com.google.protobuf.DescriptorProtos.FileOptions, com.google.protobuf.DescriptorProtos.FileOptions.Builder, com.google.protobuf.DescriptorProtos.FileOptionsOrBuilder>( 4014 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( 4021 4015 getOptions(), 4022 4016 getParentForChildren(), … … 4196 4190 getSourceCodeInfoFieldBuilder() { 4197 4191 if (sourceCodeInfoBuilder_ == null) { 4198 sourceCodeInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder< 4199 com.google.protobuf.DescriptorProtos.SourceCodeInfo, com.google.protobuf.DescriptorProtos.SourceCodeInfo.Builder, com.google.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder>( 4192 sourceCodeInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( 4200 4193 getSourceCodeInfo(), 4201 4194 getParentForChildren(), … … 4456 4449 case 18: { 4457 4450 if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { 4458 field_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.FieldDescriptorProto>();4451 field_ = new java.util.ArrayList<>(); 4459 4452 mutable_bitField0_ |= 0x00000002; 4460 4453 } … … 4464 4457 case 26: { 4465 4458 if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { 4466 nestedType_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.DescriptorProto>();4459 nestedType_ = new java.util.ArrayList<>(); 4467 4460 mutable_bitField0_ |= 0x00000008; 4468 4461 } … … 4472 4465 case 34: { 4473 4466 if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { 4474 enumType_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.EnumDescriptorProto>();4467 enumType_ = new java.util.ArrayList<>(); 4475 4468 mutable_bitField0_ |= 0x00000010; 4476 4469 } … … 4480 4473 case 42: { 4481 4474 if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { 4482 extensionRange_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange>();4475 extensionRange_ = new java.util.ArrayList<>(); 4483 4476 mutable_bitField0_ |= 0x00000020; 4484 4477 } … … 4488 4481 case 50: { 4489 4482 if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { 4490 extension_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.FieldDescriptorProto>();4483 extension_ = new java.util.ArrayList<>(); 4491 4484 mutable_bitField0_ |= 0x00000004; 4492 4485 } … … 4509 4502 case 66: { 4510 4503 if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { 4511 oneofDecl_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.OneofDescriptorProto>();4504 oneofDecl_ = new java.util.ArrayList<>(); 4512 4505 mutable_bitField0_ |= 0x00000040; 4513 4506 } … … 6022 6015 private void ensureFieldIsMutable() { 6023 6016 if (!((bitField0_ & 0x00000002) == 0x00000002)) { 6024 field_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.FieldDescriptorProto>(field_);6017 field_ = new java.util.ArrayList<>(field_); 6025 6018 bitField0_ |= 0x00000002; 6026 6019 } … … 6247 6240 getFieldFieldBuilder() { 6248 6241 if (fieldBuilder_ == null) { 6249 fieldBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 6250 com.google.protobuf.DescriptorProtos.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder>( 6242 fieldBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 6251 6243 field_, 6252 6244 ((bitField0_ & 0x00000002) == 0x00000002), … … 6262 6254 private void ensureExtensionIsMutable() { 6263 6255 if (!((bitField0_ & 0x00000004) == 0x00000004)) { 6264 extension_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.FieldDescriptorProto>(extension_);6256 extension_ = new java.util.ArrayList<>(extension_); 6265 6257 bitField0_ |= 0x00000004; 6266 6258 } … … 6487 6479 getExtensionFieldBuilder() { 6488 6480 if (extensionBuilder_ == null) { 6489 extensionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 6490 com.google.protobuf.DescriptorProtos.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder>( 6481 extensionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 6491 6482 extension_, 6492 6483 ((bitField0_ & 0x00000004) == 0x00000004), … … 6502 6493 private void ensureNestedTypeIsMutable() { 6503 6494 if (!((bitField0_ & 0x00000008) == 0x00000008)) { 6504 nestedType_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.DescriptorProto>(nestedType_);6495 nestedType_ = new java.util.ArrayList<>(nestedType_); 6505 6496 bitField0_ |= 0x00000008; 6506 6497 } … … 6727 6718 getNestedTypeFieldBuilder() { 6728 6719 if (nestedTypeBuilder_ == null) { 6729 nestedTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 6730 com.google.protobuf.DescriptorProtos.DescriptorProto, com.google.protobuf.DescriptorProtos.DescriptorProto.Builder, com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder>( 6720 nestedTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 6731 6721 nestedType_, 6732 6722 ((bitField0_ & 0x00000008) == 0x00000008), … … 6742 6732 private void ensureEnumTypeIsMutable() { 6743 6733 if (!((bitField0_ & 0x00000010) == 0x00000010)) { 6744 enumType_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.EnumDescriptorProto>(enumType_);6734 enumType_ = new java.util.ArrayList<>(enumType_); 6745 6735 bitField0_ |= 0x00000010; 6746 6736 } … … 6967 6957 getEnumTypeFieldBuilder() { 6968 6958 if (enumTypeBuilder_ == null) { 6969 enumTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 6970 com.google.protobuf.DescriptorProtos.EnumDescriptorProto, com.google.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder>( 6959 enumTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 6971 6960 enumType_, 6972 6961 ((bitField0_ & 0x00000010) == 0x00000010), … … 6982 6971 private void ensureExtensionRangeIsMutable() { 6983 6972 if (!((bitField0_ & 0x00000020) == 0x00000020)) { 6984 extensionRange_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange>(extensionRange_);6973 extensionRange_ = new java.util.ArrayList<>(extensionRange_); 6985 6974 bitField0_ |= 0x00000020; 6986 6975 } … … 7207 7196 getExtensionRangeFieldBuilder() { 7208 7197 if (extensionRangeBuilder_ == null) { 7209 extensionRangeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 7210 com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange, com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder, com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder>( 7198 extensionRangeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 7211 7199 extensionRange_, 7212 7200 ((bitField0_ & 0x00000020) == 0x00000020), … … 7222 7210 private void ensureOneofDeclIsMutable() { 7223 7211 if (!((bitField0_ & 0x00000040) == 0x00000040)) { 7224 oneofDecl_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.OneofDescriptorProto>(oneofDecl_);7212 oneofDecl_ = new java.util.ArrayList<>(oneofDecl_); 7225 7213 bitField0_ |= 0x00000040; 7226 7214 } … … 7447 7435 getOneofDeclFieldBuilder() { 7448 7436 if (oneofDeclBuilder_ == null) { 7449 oneofDeclBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 7450 com.google.protobuf.DescriptorProtos.OneofDescriptorProto, com.google.protobuf.DescriptorProtos.OneofDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.OneofDescriptorProtoOrBuilder>( 7437 oneofDeclBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 7451 7438 oneofDecl_, 7452 7439 ((bitField0_ & 0x00000040) == 0x00000040), … … 7564 7551 getOptionsFieldBuilder() { 7565 7552 if (optionsBuilder_ == null) { 7566 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder< 7567 com.google.protobuf.DescriptorProtos.MessageOptions, com.google.protobuf.DescriptorProtos.MessageOptions.Builder, com.google.protobuf.DescriptorProtos.MessageOptionsOrBuilder>( 7553 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( 7568 7554 getOptions(), 7569 7555 getParentForChildren(), … … 9801 9787 getOptionsFieldBuilder() { 9802 9788 if (optionsBuilder_ == null) { 9803 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder< 9804 com.google.protobuf.DescriptorProtos.FieldOptions, com.google.protobuf.DescriptorProtos.FieldOptions.Builder, com.google.protobuf.DescriptorProtos.FieldOptionsOrBuilder>( 9789 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( 9805 9790 getOptions(), 9806 9791 getParentForChildren(), … … 10425 10410 case 18: { 10426 10411 if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { 10427 value_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.EnumValueDescriptorProto>();10412 value_ = new java.util.ArrayList<>(); 10428 10413 mutable_bitField0_ |= 0x00000002; 10429 10414 } … … 11000 10985 private void ensureValueIsMutable() { 11001 10986 if (!((bitField0_ & 0x00000002) == 0x00000002)) { 11002 value_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.EnumValueDescriptorProto>(value_);10987 value_ = new java.util.ArrayList<>(value_); 11003 10988 bitField0_ |= 0x00000002; 11004 10989 } … … 11225 11210 getValueFieldBuilder() { 11226 11211 if (valueBuilder_ == null) { 11227 valueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 11228 com.google.protobuf.DescriptorProtos.EnumValueDescriptorProto, com.google.protobuf.DescriptorProtos.EnumValueDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.EnumValueDescriptorProtoOrBuilder>( 11212 valueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 11229 11213 value_, 11230 11214 ((bitField0_ & 0x00000002) == 0x00000002), … … 11342 11326 getOptionsFieldBuilder() { 11343 11327 if (optionsBuilder_ == null) { 11344 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder< 11345 com.google.protobuf.DescriptorProtos.EnumOptions, com.google.protobuf.DescriptorProtos.EnumOptions.Builder, com.google.protobuf.DescriptorProtos.EnumOptionsOrBuilder>( 11328 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( 11346 11329 getOptions(), 11347 11330 getParentForChildren(), … … 12105 12088 getOptionsFieldBuilder() { 12106 12089 if (optionsBuilder_ == null) { 12107 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder< 12108 com.google.protobuf.DescriptorProtos.EnumValueOptions, com.google.protobuf.DescriptorProtos.EnumValueOptions.Builder, com.google.protobuf.DescriptorProtos.EnumValueOptionsOrBuilder>( 12090 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( 12109 12091 getOptions(), 12110 12092 getParentForChildren(), … … 12245 12227 case 18: { 12246 12228 if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { 12247 method_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.MethodDescriptorProto>();12229 method_ = new java.util.ArrayList<>(); 12248 12230 mutable_bitField0_ |= 0x00000002; 12249 12231 } … … 12820 12802 private void ensureMethodIsMutable() { 12821 12803 if (!((bitField0_ & 0x00000002) == 0x00000002)) { 12822 method_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.MethodDescriptorProto>(method_);12804 method_ = new java.util.ArrayList<>(method_); 12823 12805 bitField0_ |= 0x00000002; 12824 12806 } … … 13045 13027 getMethodFieldBuilder() { 13046 13028 if (methodBuilder_ == null) { 13047 methodBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 13048 com.google.protobuf.DescriptorProtos.MethodDescriptorProto, com.google.protobuf.DescriptorProtos.MethodDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.MethodDescriptorProtoOrBuilder>( 13029 methodBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 13049 13030 method_, 13050 13031 ((bitField0_ & 0x00000002) == 0x00000002), … … 13162 13143 getOptionsFieldBuilder() { 13163 13144 if (optionsBuilder_ == null) { 13164 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder< 13165 com.google.protobuf.DescriptorProtos.ServiceOptions, com.google.protobuf.DescriptorProtos.ServiceOptions.Builder, com.google.protobuf.DescriptorProtos.ServiceOptionsOrBuilder>( 13145 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( 13166 13146 getOptions(), 13167 13147 getParentForChildren(), … … 14221 14201 getOptionsFieldBuilder() { 14222 14202 if (optionsBuilder_ == null) { 14223 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder< 14224 com.google.protobuf.DescriptorProtos.MethodOptions, com.google.protobuf.DescriptorProtos.MethodOptions.Builder, com.google.protobuf.DescriptorProtos.MethodOptionsOrBuilder>( 14203 optionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( 14225 14204 getOptions(), 14226 14205 getParentForChildren(), … … 14684 14663 case 7994: { 14685 14664 if (!((mutable_bitField0_ & 0x00000800) == 0x00000800)) { 14686 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>();14665 uninterpretedOption_ = new java.util.ArrayList<>(); 14687 14666 mutable_bitField0_ |= 0x00000800; 14688 14667 } … … 16606 16585 private void ensureUninterpretedOptionIsMutable() { 16607 16586 if (!((bitField0_ & 0x00000800) == 0x00000800)) { 16608 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>(uninterpretedOption_);16587 uninterpretedOption_ = new java.util.ArrayList<>(uninterpretedOption_); 16609 16588 bitField0_ |= 0x00000800; 16610 16589 } … … 16903 16882 getUninterpretedOptionFieldBuilder() { 16904 16883 if (uninterpretedOptionBuilder_ == null) { 16905 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 16906 com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>( 16884 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 16907 16885 uninterpretedOption_, 16908 16886 ((bitField0_ & 0x00000800) == 0x00000800), … … 17133 17111 case 7994: { 17134 17112 if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { 17135 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>();17113 uninterpretedOption_ = new java.util.ArrayList<>(); 17136 17114 mutable_bitField0_ |= 0x00000008; 17137 17115 } … … 17908 17886 private void ensureUninterpretedOptionIsMutable() { 17909 17887 if (!((bitField0_ & 0x00000008) == 0x00000008)) { 17910 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>(uninterpretedOption_);17888 uninterpretedOption_ = new java.util.ArrayList<>(uninterpretedOption_); 17911 17889 bitField0_ |= 0x00000008; 17912 17890 } … … 18205 18183 getUninterpretedOptionFieldBuilder() { 18206 18184 if (uninterpretedOptionBuilder_ == null) { 18207 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 18208 com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>( 18185 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 18209 18186 uninterpretedOption_, 18210 18187 ((bitField0_ & 0x00000008) == 0x00000008), … … 18576 18553 case 7994: { 18577 18554 if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { 18578 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>();18555 uninterpretedOption_ = new java.util.ArrayList<>(); 18579 18556 mutable_bitField0_ |= 0x00000040; 18580 18557 } … … 19979 19956 private void ensureUninterpretedOptionIsMutable() { 19980 19957 if (!((bitField0_ & 0x00000040) == 0x00000040)) { 19981 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>(uninterpretedOption_);19958 uninterpretedOption_ = new java.util.ArrayList<>(uninterpretedOption_); 19982 19959 bitField0_ |= 0x00000040; 19983 19960 } … … 20276 20253 getUninterpretedOptionFieldBuilder() { 20277 20254 if (uninterpretedOptionBuilder_ == null) { 20278 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 20279 com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>( 20255 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 20280 20256 uninterpretedOption_, 20281 20257 ((bitField0_ & 0x00000040) == 0x00000040), … … 20454 20430 case 7994: { 20455 20431 if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { 20456 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>();20432 uninterpretedOption_ = new java.util.ArrayList<>(); 20457 20433 mutable_bitField0_ |= 0x00000004; 20458 20434 } … … 21051 21027 private void ensureUninterpretedOptionIsMutable() { 21052 21028 if (!((bitField0_ & 0x00000004) == 0x00000004)) { 21053 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>(uninterpretedOption_);21029 uninterpretedOption_ = new java.util.ArrayList<>(uninterpretedOption_); 21054 21030 bitField0_ |= 0x00000004; 21055 21031 } … … 21348 21324 getUninterpretedOptionFieldBuilder() { 21349 21325 if (uninterpretedOptionBuilder_ == null) { 21350 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 21351 com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>( 21326 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 21352 21327 uninterpretedOption_, 21353 21328 ((bitField0_ & 0x00000004) == 0x00000004), … … 21502 21477 case 7994: { 21503 21478 if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { 21504 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>();21479 uninterpretedOption_ = new java.util.ArrayList<>(); 21505 21480 mutable_bitField0_ |= 0x00000002; 21506 21481 } … … 22005 21980 private void ensureUninterpretedOptionIsMutable() { 22006 21981 if (!((bitField0_ & 0x00000002) == 0x00000002)) { 22007 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>(uninterpretedOption_);21982 uninterpretedOption_ = new java.util.ArrayList<>(uninterpretedOption_); 22008 21983 bitField0_ |= 0x00000002; 22009 21984 } … … 22302 22277 getUninterpretedOptionFieldBuilder() { 22303 22278 if (uninterpretedOptionBuilder_ == null) { 22304 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 22305 com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>( 22279 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 22306 22280 uninterpretedOption_, 22307 22281 ((bitField0_ & 0x00000002) == 0x00000002), … … 22456 22430 case 7994: { 22457 22431 if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { 22458 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>();22432 uninterpretedOption_ = new java.util.ArrayList<>(); 22459 22433 mutable_bitField0_ |= 0x00000002; 22460 22434 } … … 22959 22933 private void ensureUninterpretedOptionIsMutable() { 22960 22934 if (!((bitField0_ & 0x00000002) == 0x00000002)) { 22961 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>(uninterpretedOption_);22935 uninterpretedOption_ = new java.util.ArrayList<>(uninterpretedOption_); 22962 22936 bitField0_ |= 0x00000002; 22963 22937 } … … 23256 23230 getUninterpretedOptionFieldBuilder() { 23257 23231 if (uninterpretedOptionBuilder_ == null) { 23258 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 23259 com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>( 23232 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 23260 23233 uninterpretedOption_, 23261 23234 ((bitField0_ & 0x00000002) == 0x00000002), … … 23410 23383 case 7994: { 23411 23384 if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { 23412 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>();23385 uninterpretedOption_ = new java.util.ArrayList<>(); 23413 23386 mutable_bitField0_ |= 0x00000002; 23414 23387 } … … 23913 23886 private void ensureUninterpretedOptionIsMutable() { 23914 23887 if (!((bitField0_ & 0x00000002) == 0x00000002)) { 23915 uninterpretedOption_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption>(uninterpretedOption_);23888 uninterpretedOption_ = new java.util.ArrayList<>(uninterpretedOption_); 23916 23889 bitField0_ |= 0x00000002; 23917 23890 } … … 24210 24183 getUninterpretedOptionFieldBuilder() { 24211 24184 if (uninterpretedOptionBuilder_ == null) { 24212 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 24213 com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>( 24185 uninterpretedOptionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 24214 24186 uninterpretedOption_, 24215 24187 ((bitField0_ & 0x00000002) == 0x00000002), … … 24402 24374 case 18: { 24403 24375 if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { 24404 name_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePart>();24376 name_ = new java.util.ArrayList<>(); 24405 24377 mutable_bitField0_ |= 0x00000001; 24406 24378 } … … 25656 25628 private void ensureNameIsMutable() { 25657 25629 if (!((bitField0_ & 0x00000001) == 0x00000001)) { 25658 name_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePart>(name_);25630 name_ = new java.util.ArrayList<>(name_); 25659 25631 bitField0_ |= 0x00000001; 25660 25632 } … … 25881 25853 getNameFieldBuilder() { 25882 25854 if (nameBuilder_ == null) { 25883 nameBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 25884 com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePart, com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePart.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePartOrBuilder>( 25855 nameBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 25885 25856 name_, 25886 25857 ((bitField0_ & 0x00000001) == 0x00000001), … … 26523 26494 case 10: { 26524 26495 if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { 26525 location_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.SourceCodeInfo.Location>();26496 location_ = new java.util.ArrayList<>(); 26526 26497 mutable_bitField0_ |= 0x00000001; 26527 26498 } … … 26869 26840 case 8: { 26870 26841 if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { 26871 path_ = new java.util.ArrayList< java.lang.Integer>();26842 path_ = new java.util.ArrayList<>(); 26872 26843 mutable_bitField0_ |= 0x00000001; 26873 26844 } … … 26879 26850 int limit = input.pushLimit(length); 26880 26851 if (!((mutable_bitField0_ & 0x00000001) == 0x00000001) && input.getBytesUntilLimit() > 0) { 26881 path_ = new java.util.ArrayList< java.lang.Integer>();26852 path_ = new java.util.ArrayList<>(); 26882 26853 mutable_bitField0_ |= 0x00000001; 26883 26854 } … … 26890 26861 case 16: { 26891 26862 if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { 26892 span_ = new java.util.ArrayList< java.lang.Integer>();26863 span_ = new java.util.ArrayList<>(); 26893 26864 mutable_bitField0_ |= 0x00000002; 26894 26865 } … … 26900 26871 int limit = input.pushLimit(length); 26901 26872 if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) && input.getBytesUntilLimit() > 0) { 26902 span_ = new java.util.ArrayList< java.lang.Integer>();26873 span_ = new java.util.ArrayList<>(); 26903 26874 mutable_bitField0_ |= 0x00000002; 26904 26875 } … … 27614 27585 private void ensurePathIsMutable() { 27615 27586 if (!((bitField0_ & 0x00000001) == 0x00000001)) { 27616 path_ = new java.util.ArrayList< java.lang.Integer>(path_);27587 path_ = new java.util.ArrayList<>(path_); 27617 27588 bitField0_ |= 0x00000001; 27618 27589 } … … 27848 27819 private void ensureSpanIsMutable() { 27849 27820 if (!((bitField0_ & 0x00000002) == 0x00000002)) { 27850 span_ = new java.util.ArrayList< java.lang.Integer>(span_);27821 span_ = new java.util.ArrayList<>(span_); 27851 27822 bitField0_ |= 0x00000002; 27852 27823 } … … 28834 28805 private void ensureLocationIsMutable() { 28835 28806 if (!((bitField0_ & 0x00000001) == 0x00000001)) { 28836 location_ = new java.util.ArrayList< com.google.protobuf.DescriptorProtos.SourceCodeInfo.Location>(location_);28807 location_ = new java.util.ArrayList<>(location_); 28837 28808 bitField0_ |= 0x00000001; 28838 28809 } … … 29851 29822 getLocationFieldBuilder() { 29852 29823 if (locationBuilder_ == null) { 29853 locationBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< 29854 com.google.protobuf.DescriptorProtos.SourceCodeInfo.Location, com.google.protobuf.DescriptorProtos.SourceCodeInfo.Location.Builder, com.google.protobuf.DescriptorProtos.SourceCodeInfo.LocationOrBuilder>( 29824 locationBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( 29855 29825 location_, 29856 29826 ((bitField0_ & 0x00000001) == 0x00000001),
Note:
See TracChangeset
for help on using the changeset viewer.