Index: /applications/editors/josm/plugins/pbf/gen/com/google/protobuf/DescriptorProtos.java =================================================================== --- /applications/editors/josm/plugins/pbf/gen/com/google/protobuf/DescriptorProtos.java (revision 31904) +++ /applications/editors/josm/plugins/pbf/gen/com/google/protobuf/DescriptorProtos.java (revision 31905) @@ -16,5 +16,5 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - java.util.List + java.util.List getFileList(); /** @@ -29,5 +29,5 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - java.util.List + java.util.List getFileOrBuilderList(); /** @@ -61,5 +61,6 @@ } - public FileDescriptorSet getDefaultInstanceForType() { + @Override + public FileDescriptorSet getDefaultInstanceForType() { return defaultInstance; } @@ -122,5 +123,6 @@ } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_fieldAccessorTable @@ -131,5 +133,6 @@ public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public FileDescriptorSet parsePartialFrom( + @Override + public FileDescriptorSet parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -149,5 +152,6 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public java.util.List getFileList() { + @Override + public java.util.List getFileList() { return file_; } @@ -155,5 +159,6 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public java.util.List + @Override + public java.util.List getFileOrBuilderList() { return file_; @@ -162,5 +167,6 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public int getFileCount() { + @Override + public int getFileCount() { return file_.size(); } @@ -168,5 +174,6 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public com.google.protobuf.DescriptorProtos.FileDescriptorProto getFile(int index) { + @Override + public com.google.protobuf.DescriptorProtos.FileDescriptorProto getFile(int index) { return file_.get(index); } @@ -174,5 +181,6 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public com.google.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getFileOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getFileOrBuilder( int index) { return file_.get(index); @@ -183,5 +191,6 @@ } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -198,5 +207,6 @@ } - public void writeTo(com.google.protobuf.CodedOutputStream output) + @Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -208,5 +218,6 @@ private int memoizedSerializedSize = -1; - public int getSerializedSize() { + @Override + public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; @@ -283,9 +294,11 @@ public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } + @Override + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.google.protobuf.DescriptorProtos.FileDescriptorSet prototype) { return newBuilder().mergeFrom(prototype); } - public Builder toBuilder() { return newBuilder(this); } + @Override + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -312,5 +325,6 @@ } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_fieldAccessorTable @@ -338,5 +352,6 @@ } - public Builder clear() { + @Override + public Builder clear() { super.clear(); if (fileBuilder_ == null) { @@ -349,18 +364,22 @@ } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_descriptor; } - public com.google.protobuf.DescriptorProtos.FileDescriptorSet getDefaultInstanceForType() { + @Override + public com.google.protobuf.DescriptorProtos.FileDescriptorSet getDefaultInstanceForType() { return com.google.protobuf.DescriptorProtos.FileDescriptorSet.getDefaultInstance(); } - public com.google.protobuf.DescriptorProtos.FileDescriptorSet build() { + @Override + public com.google.protobuf.DescriptorProtos.FileDescriptorSet build() { com.google.protobuf.DescriptorProtos.FileDescriptorSet result = buildPartial(); if (!result.isInitialized()) { @@ -370,5 +389,6 @@ } - public com.google.protobuf.DescriptorProtos.FileDescriptorSet buildPartial() { + @Override + public com.google.protobuf.DescriptorProtos.FileDescriptorSet buildPartial() { com.google.protobuf.DescriptorProtos.FileDescriptorSet result = new com.google.protobuf.DescriptorProtos.FileDescriptorSet(this); int from_bitField0_ = bitField0_; @@ -386,5 +406,6 @@ } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.protobuf.DescriptorProtos.FileDescriptorSet) { return mergeFrom((com.google.protobuf.DescriptorProtos.FileDescriptorSet)other); @@ -415,5 +436,5 @@ file_ = other.file_; bitField0_ = (bitField0_ & ~0x00000001); - fileBuilder_ = + fileBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getFileFieldBuilder() : null; @@ -427,8 +448,9 @@ } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { for (int i = 0; i < getFileCount(); i++) { if (!getFile(i).isInitialized()) { - + return false; } @@ -437,5 +459,6 @@ } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -471,5 +494,6 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public java.util.List getFileList() { + @Override + public java.util.List getFileList() { if (fileBuilder_ == null) { return java.util.Collections.unmodifiableList(file_); @@ -481,5 +505,6 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public int getFileCount() { + @Override + public int getFileCount() { if (fileBuilder_ == null) { return file_.size(); @@ -491,5 +516,6 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public com.google.protobuf.DescriptorProtos.FileDescriptorProto getFile(int index) { + @Override + public com.google.protobuf.DescriptorProtos.FileDescriptorProto getFile(int index) { if (fileBuilder_ == null) { return file_.get(index); @@ -641,5 +667,6 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public com.google.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getFileOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getFileOrBuilder( int index) { if (fileBuilder_ == null) { @@ -651,5 +678,6 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public java.util.List + @Override + public java.util.List getFileOrBuilderList() { if (fileBuilder_ != null) { @@ -677,10 +705,10 @@ * repeated .google.protobuf.FileDescriptorProto file = 1; */ - public java.util.List + public java.util.List getFileBuilderList() { return getFileFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.FileDescriptorProto, com.google.protobuf.DescriptorProtos.FileDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder> + com.google.protobuf.DescriptorProtos.FileDescriptorProto, com.google.protobuf.DescriptorProtos.FileDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder> getFileFieldBuilder() { if (fileBuilder_ == null) { @@ -857,5 +885,5 @@ * */ - java.util.List + java.util.List getMessageTypeList(); /** @@ -882,5 +910,5 @@ * */ - java.util.List + java.util.List getMessageTypeOrBuilderList(); /** @@ -897,5 +925,5 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - java.util.List + java.util.List getEnumTypeList(); /** @@ -910,5 +938,5 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - java.util.List + java.util.List getEnumTypeOrBuilderList(); /** @@ -921,5 +949,5 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - java.util.List + java.util.List getServiceList(); /** @@ -934,5 +962,5 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - java.util.List + java.util.List getServiceOrBuilderList(); /** @@ -945,5 +973,5 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - java.util.List + java.util.List getExtensionList(); /** @@ -958,5 +986,5 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - java.util.List + java.util.List getExtensionOrBuilderList(); /** @@ -1036,5 +1064,6 @@ } - public FileDescriptorProto getDefaultInstanceForType() { + @Override + public FileDescriptorProto getDefaultInstanceForType() { return defaultInstance; } @@ -1228,5 +1257,6 @@ } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_fieldAccessorTable @@ -1237,5 +1267,6 @@ public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public FileDescriptorProto parsePartialFrom( + @Override + public FileDescriptorProto parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1260,5 +1291,6 @@ * */ - public boolean hasName() { + @Override + public boolean hasName() { return ((bitField0_ & 0x00000001) == 0x00000001); } @@ -1270,10 +1302,11 @@ * */ - public java.lang.String getName() { + @Override + public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); @@ -1291,9 +1324,10 @@ * */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); @@ -1314,5 +1348,6 @@ * */ - public boolean hasPackage() { + @Override + public boolean hasPackage() { return ((bitField0_ & 0x00000002) == 0x00000002); } @@ -1324,10 +1359,11 @@ * */ - public java.lang.String getPackage() { + @Override + public java.lang.String getPackage() { java.lang.Object ref = package_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); @@ -1345,9 +1381,10 @@ * */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getPackageBytes() { java.lang.Object ref = package_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); @@ -1368,5 +1405,6 @@ * */ - public com.google.protobuf.ProtocolStringList + @Override + public com.google.protobuf.ProtocolStringList getDependencyList() { return dependency_; @@ -1379,5 +1417,6 @@ * */ - public int getDependencyCount() { + @Override + public int getDependencyCount() { return dependency_.size(); } @@ -1389,5 +1428,6 @@ * */ - public java.lang.String getDependency(int index) { + @Override + public java.lang.String getDependency(int index) { return dependency_.get(index); } @@ -1399,5 +1439,6 @@ * */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getDependencyBytes(int index) { return dependency_.getByteString(index); @@ -1413,5 +1454,6 @@ * */ - public java.util.List + @Override + public java.util.List getPublicDependencyList() { return publicDependency_; @@ -1424,5 +1466,6 @@ * */ - public int getPublicDependencyCount() { + @Override + public int getPublicDependencyCount() { return publicDependency_.size(); } @@ -1434,5 +1477,6 @@ * */ - public int getPublicDependency(int index) { + @Override + public int getPublicDependency(int index) { return publicDependency_.get(index); } @@ -1448,5 +1492,6 @@ * */ - public java.util.List + @Override + public java.util.List getWeakDependencyList() { return weakDependency_; @@ -1460,5 +1505,6 @@ * */ - public int getWeakDependencyCount() { + @Override + public int getWeakDependencyCount() { return weakDependency_.size(); } @@ -1471,5 +1517,6 @@ * */ - public int getWeakDependency(int index) { + @Override + public int getWeakDependency(int index) { return weakDependency_.get(index); } @@ -1484,5 +1531,6 @@ * */ - public java.util.List getMessageTypeList() { + @Override + public java.util.List getMessageTypeList() { return messageType_; } @@ -1494,5 +1542,6 @@ * */ - public java.util.List + @Override + public java.util.List getMessageTypeOrBuilderList() { return messageType_; @@ -1505,5 +1554,6 @@ * */ - public int getMessageTypeCount() { + @Override + public int getMessageTypeCount() { return messageType_.size(); } @@ -1515,5 +1565,6 @@ * */ - public com.google.protobuf.DescriptorProtos.DescriptorProto getMessageType(int index) { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto getMessageType(int index) { return messageType_.get(index); } @@ -1525,5 +1576,6 @@ * */ - public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getMessageTypeOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getMessageTypeOrBuilder( int index) { return messageType_.get(index); @@ -1535,5 +1587,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public java.util.List getEnumTypeList() { + @Override + public java.util.List getEnumTypeList() { return enumType_; } @@ -1541,5 +1594,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public java.util.List + @Override + public java.util.List getEnumTypeOrBuilderList() { return enumType_; @@ -1548,5 +1602,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public int getEnumTypeCount() { + @Override + public int getEnumTypeCount() { return enumType_.size(); } @@ -1554,5 +1609,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public com.google.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) { + @Override + public com.google.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) { return enumType_.get(index); } @@ -1560,5 +1616,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder( int index) { return enumType_.get(index); @@ -1570,5 +1627,6 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public java.util.List getServiceList() { + @Override + public java.util.List getServiceList() { return service_; } @@ -1576,5 +1634,6 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public java.util.List + @Override + public java.util.List getServiceOrBuilderList() { return service_; @@ -1583,5 +1642,6 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public int getServiceCount() { + @Override + public int getServiceCount() { return service_.size(); } @@ -1589,5 +1649,6 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public com.google.protobuf.DescriptorProtos.ServiceDescriptorProto getService(int index) { + @Override + public com.google.protobuf.DescriptorProtos.ServiceDescriptorProto getService(int index) { return service_.get(index); } @@ -1595,5 +1656,6 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public com.google.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder getServiceOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder getServiceOrBuilder( int index) { return service_.get(index); @@ -1605,5 +1667,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public java.util.List getExtensionList() { + @Override + public java.util.List getExtensionList() { return extension_; } @@ -1611,5 +1674,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public java.util.List + @Override + public java.util.List getExtensionOrBuilderList() { return extension_; @@ -1618,5 +1682,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public int getExtensionCount() { + @Override + public int getExtensionCount() { return extension_.size(); } @@ -1624,5 +1689,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) { + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) { return extension_.get(index); } @@ -1630,5 +1696,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder( int index) { return extension_.get(index); @@ -1640,5 +1707,6 @@ * optional .google.protobuf.FileOptions options = 8; */ - public boolean hasOptions() { + @Override + public boolean hasOptions() { return ((bitField0_ & 0x00000004) == 0x00000004); } @@ -1646,5 +1714,6 @@ * optional .google.protobuf.FileOptions options = 8; */ - public com.google.protobuf.DescriptorProtos.FileOptions getOptions() { + @Override + public com.google.protobuf.DescriptorProtos.FileOptions getOptions() { return options_; } @@ -1652,5 +1721,6 @@ * optional .google.protobuf.FileOptions options = 8; */ - public com.google.protobuf.DescriptorProtos.FileOptionsOrBuilder getOptionsOrBuilder() { + @Override + public com.google.protobuf.DescriptorProtos.FileOptionsOrBuilder getOptionsOrBuilder() { return options_; } @@ -1668,5 +1738,6 @@ * */ - public boolean hasSourceCodeInfo() { + @Override + public boolean hasSourceCodeInfo() { return ((bitField0_ & 0x00000008) == 0x00000008); } @@ -1681,5 +1752,6 @@ * */ - public com.google.protobuf.DescriptorProtos.SourceCodeInfo getSourceCodeInfo() { + @Override + public com.google.protobuf.DescriptorProtos.SourceCodeInfo getSourceCodeInfo() { return sourceCodeInfo_; } @@ -1694,5 +1766,6 @@ * */ - public com.google.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder getSourceCodeInfoOrBuilder() { + @Override + public com.google.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder getSourceCodeInfoOrBuilder() { return sourceCodeInfo_; } @@ -1712,5 +1785,6 @@ } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1751,5 +1825,6 @@ } - public void writeTo(com.google.protobuf.CodedOutputStream output) + @Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -1791,5 +1866,6 @@ private int memoizedSerializedSize = -1; - public int getSerializedSize() { + @Override + public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; @@ -1921,9 +1997,11 @@ public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } + @Override + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.google.protobuf.DescriptorProtos.FileDescriptorProto prototype) { return newBuilder().mergeFrom(prototype); } - public Builder toBuilder() { return newBuilder(this); } + @Override + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -1949,5 +2027,6 @@ } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_fieldAccessorTable @@ -1980,5 +2059,6 @@ } - public Builder clear() { + @Override + public Builder clear() { super.clear(); name_ = ""; @@ -2031,18 +2111,22 @@ } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_descriptor; } - public com.google.protobuf.DescriptorProtos.FileDescriptorProto getDefaultInstanceForType() { + @Override + public com.google.protobuf.DescriptorProtos.FileDescriptorProto getDefaultInstanceForType() { return com.google.protobuf.DescriptorProtos.FileDescriptorProto.getDefaultInstance(); } - public com.google.protobuf.DescriptorProtos.FileDescriptorProto build() { + @Override + public com.google.protobuf.DescriptorProtos.FileDescriptorProto build() { com.google.protobuf.DescriptorProtos.FileDescriptorProto result = buildPartial(); if (!result.isInitialized()) { @@ -2052,5 +2136,6 @@ } - public com.google.protobuf.DescriptorProtos.FileDescriptorProto buildPartial() { + @Override + public com.google.protobuf.DescriptorProtos.FileDescriptorProto buildPartial() { com.google.protobuf.DescriptorProtos.FileDescriptorProto result = new com.google.protobuf.DescriptorProtos.FileDescriptorProto(this); int from_bitField0_ = bitField0_; @@ -2136,5 +2221,6 @@ } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.protobuf.DescriptorProtos.FileDescriptorProto) { return mergeFrom((com.google.protobuf.DescriptorProtos.FileDescriptorProto)other); @@ -2205,5 +2291,5 @@ messageType_ = other.messageType_; bitField0_ = (bitField0_ & ~0x00000020); - messageTypeBuilder_ = + messageTypeBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getMessageTypeFieldBuilder() : null; @@ -2231,5 +2317,5 @@ enumType_ = other.enumType_; bitField0_ = (bitField0_ & ~0x00000040); - enumTypeBuilder_ = + enumTypeBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getEnumTypeFieldBuilder() : null; @@ -2257,5 +2343,5 @@ service_ = other.service_; bitField0_ = (bitField0_ & ~0x00000080); - serviceBuilder_ = + serviceBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getServiceFieldBuilder() : null; @@ -2283,5 +2369,5 @@ extension_ = other.extension_; bitField0_ = (bitField0_ & ~0x00000100); - extensionBuilder_ = + extensionBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getExtensionFieldBuilder() : null; @@ -2301,8 +2387,9 @@ } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { for (int i = 0; i < getMessageTypeCount(); i++) { if (!getMessageType(i).isInitialized()) { - + return false; } @@ -2310,5 +2397,5 @@ for (int i = 0; i < getEnumTypeCount(); i++) { if (!getEnumType(i).isInitialized()) { - + return false; } @@ -2316,5 +2403,5 @@ for (int i = 0; i < getServiceCount(); i++) { if (!getService(i).isInitialized()) { - + return false; } @@ -2322,5 +2409,5 @@ for (int i = 0; i < getExtensionCount(); i++) { if (!getExtension(i).isInitialized()) { - + return false; } @@ -2328,5 +2415,5 @@ if (hasOptions()) { if (!getOptions().isInitialized()) { - + return false; } @@ -2335,5 +2422,6 @@ } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2362,5 +2450,6 @@ * */ - public boolean hasName() { + @Override + public boolean hasName() { return ((bitField0_ & 0x00000001) == 0x00000001); } @@ -2372,5 +2461,6 @@ * */ - public java.lang.String getName() { + @Override + public java.lang.String getName() { java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { @@ -2393,9 +2483,10 @@ * */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); @@ -2462,5 +2553,6 @@ * */ - public boolean hasPackage() { + @Override + public boolean hasPackage() { return ((bitField0_ & 0x00000002) == 0x00000002); } @@ -2472,5 +2564,6 @@ * */ - public java.lang.String getPackage() { + @Override + public java.lang.String getPackage() { java.lang.Object ref = package_; if (!(ref instanceof java.lang.String)) { @@ -2493,9 +2586,10 @@ * */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getPackageBytes() { java.lang.Object ref = package_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); @@ -2568,5 +2662,6 @@ * */ - public com.google.protobuf.ProtocolStringList + @Override + public com.google.protobuf.ProtocolStringList getDependencyList() { return dependency_.getUnmodifiableView(); @@ -2579,5 +2674,6 @@ * */ - public int getDependencyCount() { + @Override + public int getDependencyCount() { return dependency_.size(); } @@ -2589,5 +2685,6 @@ * */ - public java.lang.String getDependency(int index) { + @Override + public java.lang.String getDependency(int index) { return dependency_.get(index); } @@ -2599,5 +2696,6 @@ * */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getDependencyBytes(int index) { return dependency_.getByteString(index); @@ -2697,5 +2795,6 @@ * */ - public java.util.List + @Override + public java.util.List getPublicDependencyList() { return java.util.Collections.unmodifiableList(publicDependency_); @@ -2708,5 +2807,6 @@ * */ - public int getPublicDependencyCount() { + @Override + public int getPublicDependencyCount() { return publicDependency_.size(); } @@ -2718,5 +2818,6 @@ * */ - public int getPublicDependency(int index) { + @Override + public int getPublicDependency(int index) { return publicDependency_.get(index); } @@ -2792,5 +2893,6 @@ * */ - public java.util.List + @Override + public java.util.List getWeakDependencyList() { return java.util.Collections.unmodifiableList(weakDependency_); @@ -2804,5 +2906,6 @@ * */ - public int getWeakDependencyCount() { + @Override + public int getWeakDependencyCount() { return weakDependency_.size(); } @@ -2815,5 +2918,6 @@ * */ - public int getWeakDependency(int index) { + @Override + public int getWeakDependency(int index) { return weakDependency_.get(index); } @@ -2897,5 +3001,6 @@ * */ - public java.util.List getMessageTypeList() { + @Override + public java.util.List getMessageTypeList() { if (messageTypeBuilder_ == null) { return java.util.Collections.unmodifiableList(messageType_); @@ -2911,5 +3016,6 @@ * */ - public int getMessageTypeCount() { + @Override + public int getMessageTypeCount() { if (messageTypeBuilder_ == null) { return messageType_.size(); @@ -2925,5 +3031,6 @@ * */ - public com.google.protobuf.DescriptorProtos.DescriptorProto getMessageType(int index) { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto getMessageType(int index) { if (messageTypeBuilder_ == null) { return messageType_.get(index); @@ -3119,5 +3226,6 @@ * */ - public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getMessageTypeOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getMessageTypeOrBuilder( int index) { if (messageTypeBuilder_ == null) { @@ -3133,5 +3241,6 @@ * */ - public java.util.List + @Override + public java.util.List getMessageTypeOrBuilderList() { if (messageTypeBuilder_ != null) { @@ -3171,10 +3280,10 @@ * */ - public java.util.List + public java.util.List getMessageTypeBuilderList() { return getMessageTypeFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.DescriptorProto, com.google.protobuf.DescriptorProtos.DescriptorProto.Builder, com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> + com.google.protobuf.DescriptorProtos.DescriptorProto, com.google.protobuf.DescriptorProtos.DescriptorProto.Builder, com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> getMessageTypeFieldBuilder() { if (messageTypeBuilder_ == null) { @@ -3204,5 +3313,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public java.util.List getEnumTypeList() { + @Override + public java.util.List getEnumTypeList() { if (enumTypeBuilder_ == null) { return java.util.Collections.unmodifiableList(enumType_); @@ -3214,5 +3324,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public int getEnumTypeCount() { + @Override + public int getEnumTypeCount() { if (enumTypeBuilder_ == null) { return enumType_.size(); @@ -3224,5 +3335,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public com.google.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) { + @Override + public com.google.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) { if (enumTypeBuilder_ == null) { return enumType_.get(index); @@ -3374,5 +3486,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder( int index) { if (enumTypeBuilder_ == null) { @@ -3384,5 +3497,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public java.util.List + @Override + public java.util.List getEnumTypeOrBuilderList() { if (enumTypeBuilder_ != null) { @@ -3410,10 +3524,10 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 5; */ - public java.util.List + public java.util.List getEnumTypeBuilderList() { return getEnumTypeFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.EnumDescriptorProto, com.google.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> + com.google.protobuf.DescriptorProtos.EnumDescriptorProto, com.google.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> getEnumTypeFieldBuilder() { if (enumTypeBuilder_ == null) { @@ -3443,5 +3557,6 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public java.util.List getServiceList() { + @Override + public java.util.List getServiceList() { if (serviceBuilder_ == null) { return java.util.Collections.unmodifiableList(service_); @@ -3453,5 +3568,6 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public int getServiceCount() { + @Override + public int getServiceCount() { if (serviceBuilder_ == null) { return service_.size(); @@ -3463,5 +3579,6 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public com.google.protobuf.DescriptorProtos.ServiceDescriptorProto getService(int index) { + @Override + public com.google.protobuf.DescriptorProtos.ServiceDescriptorProto getService(int index) { if (serviceBuilder_ == null) { return service_.get(index); @@ -3613,5 +3730,6 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public com.google.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder getServiceOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder getServiceOrBuilder( int index) { if (serviceBuilder_ == null) { @@ -3623,5 +3741,6 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public java.util.List + @Override + public java.util.List getServiceOrBuilderList() { if (serviceBuilder_ != null) { @@ -3649,10 +3768,10 @@ * repeated .google.protobuf.ServiceDescriptorProto service = 6; */ - public java.util.List + public java.util.List getServiceBuilderList() { return getServiceFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.ServiceDescriptorProto, com.google.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder> + com.google.protobuf.DescriptorProtos.ServiceDescriptorProto, com.google.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder> getServiceFieldBuilder() { if (serviceBuilder_ == null) { @@ -3682,5 +3801,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public java.util.List getExtensionList() { + @Override + public java.util.List getExtensionList() { if (extensionBuilder_ == null) { return java.util.Collections.unmodifiableList(extension_); @@ -3692,5 +3812,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public int getExtensionCount() { + @Override + public int getExtensionCount() { if (extensionBuilder_ == null) { return extension_.size(); @@ -3702,5 +3823,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) { + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) { if (extensionBuilder_ == null) { return extension_.get(index); @@ -3852,5 +3974,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder( int index) { if (extensionBuilder_ == null) { @@ -3862,5 +3985,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public java.util.List + @Override + public java.util.List getExtensionOrBuilderList() { if (extensionBuilder_ != null) { @@ -3888,10 +4012,10 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 7; */ - public java.util.List + public java.util.List getExtensionBuilderList() { return getExtensionFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> + com.google.protobuf.DescriptorProtos.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> getExtensionFieldBuilder() { if (extensionBuilder_ == null) { @@ -3912,5 +4036,6 @@ * optional .google.protobuf.FileOptions options = 8; */ - public boolean hasOptions() { + @Override + public boolean hasOptions() { return ((bitField0_ & 0x00000200) == 0x00000200); } @@ -3918,5 +4043,6 @@ * optional .google.protobuf.FileOptions options = 8; */ - public com.google.protobuf.DescriptorProtos.FileOptions getOptions() { + @Override + public com.google.protobuf.DescriptorProtos.FileOptions getOptions() { if (optionsBuilder_ == null) { return options_; @@ -3998,5 +4124,6 @@ * optional .google.protobuf.FileOptions options = 8; */ - public com.google.protobuf.DescriptorProtos.FileOptionsOrBuilder getOptionsOrBuilder() { + @Override + public com.google.protobuf.DescriptorProtos.FileOptionsOrBuilder getOptionsOrBuilder() { if (optionsBuilder_ != null) { return optionsBuilder_.getMessageOrBuilder(); @@ -4009,5 +4136,5 @@ */ private com.google.protobuf.SingleFieldBuilder< - com.google.protobuf.DescriptorProtos.FileOptions, com.google.protobuf.DescriptorProtos.FileOptions.Builder, com.google.protobuf.DescriptorProtos.FileOptionsOrBuilder> + com.google.protobuf.DescriptorProtos.FileOptions, com.google.protobuf.DescriptorProtos.FileOptions.Builder, com.google.protobuf.DescriptorProtos.FileOptionsOrBuilder> getOptionsFieldBuilder() { if (optionsBuilder_ == null) { @@ -4034,5 +4161,6 @@ * */ - public boolean hasSourceCodeInfo() { + @Override + public boolean hasSourceCodeInfo() { return ((bitField0_ & 0x00000400) == 0x00000400); } @@ -4047,5 +4175,6 @@ * */ - public com.google.protobuf.DescriptorProtos.SourceCodeInfo getSourceCodeInfo() { + @Override + public com.google.protobuf.DescriptorProtos.SourceCodeInfo getSourceCodeInfo() { if (sourceCodeInfoBuilder_ == null) { return sourceCodeInfo_; @@ -4169,5 +4298,6 @@ * */ - public com.google.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder getSourceCodeInfoOrBuilder() { + @Override + public com.google.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder getSourceCodeInfoOrBuilder() { if (sourceCodeInfoBuilder_ != null) { return sourceCodeInfoBuilder_.getMessageOrBuilder(); @@ -4187,5 +4317,5 @@ */ private com.google.protobuf.SingleFieldBuilder< - com.google.protobuf.DescriptorProtos.SourceCodeInfo, com.google.protobuf.DescriptorProtos.SourceCodeInfo.Builder, com.google.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder> + com.google.protobuf.DescriptorProtos.SourceCodeInfo, com.google.protobuf.DescriptorProtos.SourceCodeInfo.Builder, com.google.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder> getSourceCodeInfoFieldBuilder() { if (sourceCodeInfoBuilder_ == null) { @@ -4231,5 +4361,5 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - java.util.List + java.util.List getFieldList(); /** @@ -4244,5 +4374,5 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - java.util.List + java.util.List getFieldOrBuilderList(); /** @@ -4255,5 +4385,5 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - java.util.List + java.util.List getExtensionList(); /** @@ -4268,5 +4398,5 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - java.util.List + java.util.List getExtensionOrBuilderList(); /** @@ -4279,5 +4409,5 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - java.util.List + java.util.List getNestedTypeList(); /** @@ -4292,5 +4422,5 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - java.util.List + java.util.List getNestedTypeOrBuilderList(); /** @@ -4303,5 +4433,5 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - java.util.List + java.util.List getEnumTypeList(); /** @@ -4316,5 +4446,5 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - java.util.List + java.util.List getEnumTypeOrBuilderList(); /** @@ -4327,5 +4457,5 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - java.util.List + java.util.List getExtensionRangeList(); /** @@ -4340,5 +4470,5 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - java.util.List + java.util.List getExtensionRangeOrBuilderList(); /** @@ -4351,5 +4481,5 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - java.util.List + java.util.List getOneofDeclList(); /** @@ -4364,5 +4494,5 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - java.util.List + java.util.List getOneofDeclOrBuilderList(); /** @@ -4408,5 +4538,6 @@ } - public DescriptorProto getDefaultInstanceForType() { + @Override + public DescriptorProto getDefaultInstanceForType() { return defaultInstance; } @@ -4543,5 +4674,6 @@ } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_fieldAccessorTable @@ -4552,5 +4684,6 @@ public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public DescriptorProto parsePartialFrom( + @Override + public DescriptorProto parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4606,5 +4739,6 @@ } - public ExtensionRange getDefaultInstanceForType() { + @Override + public ExtensionRange getDefaultInstanceForType() { return defaultInstance; } @@ -4666,5 +4800,6 @@ } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_fieldAccessorTable @@ -4675,5 +4810,6 @@ public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public ExtensionRange parsePartialFrom( + @Override + public ExtensionRange parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4694,5 +4830,6 @@ * optional int32 start = 1; */ - public boolean hasStart() { + @Override + public boolean hasStart() { return ((bitField0_ & 0x00000001) == 0x00000001); } @@ -4700,5 +4837,6 @@ * optional int32 start = 1; */ - public int getStart() { + @Override + public int getStart() { return start_; } @@ -4709,5 +4847,6 @@ * optional int32 end = 2; */ - public boolean hasEnd() { + @Override + public boolean hasEnd() { return ((bitField0_ & 0x00000002) == 0x00000002); } @@ -4715,5 +4854,6 @@ * optional int32 end = 2; */ - public int getEnd() { + @Override + public int getEnd() { return end_; } @@ -4724,5 +4864,6 @@ } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -4733,5 +4874,6 @@ } - public void writeTo(com.google.protobuf.CodedOutputStream output) + @Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -4746,5 +4888,6 @@ private int memoizedSerializedSize = -1; - public int getSerializedSize() { + @Override + public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; @@ -4825,9 +4968,11 @@ public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } + @Override + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange prototype) { return newBuilder().mergeFrom(prototype); } - public Builder toBuilder() { return newBuilder(this); } + @Override + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -4849,5 +4994,6 @@ } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_fieldAccessorTable @@ -4874,5 +5020,6 @@ } - public Builder clear() { + @Override + public Builder clear() { super.clear(); start_ = 0; @@ -4883,18 +5030,22 @@ } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor; } - public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getDefaultInstanceForType() { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getDefaultInstanceForType() { return com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.getDefaultInstance(); } - public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange build() { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange build() { com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange result = buildPartial(); if (!result.isInitialized()) { @@ -4904,5 +5055,6 @@ } - public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange buildPartial() { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange buildPartial() { com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange result = new com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange(this); int from_bitField0_ = bitField0_; @@ -4921,5 +5073,6 @@ } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange) { return mergeFrom((com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange)other); @@ -4942,9 +5095,11 @@ } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { return true; } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4969,5 +5124,6 @@ * optional int32 start = 1; */ - public boolean hasStart() { + @Override + public boolean hasStart() { return ((bitField0_ & 0x00000001) == 0x00000001); } @@ -4975,5 +5131,6 @@ * optional int32 start = 1; */ - public int getStart() { + @Override + public int getStart() { return start_; } @@ -5001,5 +5158,6 @@ * optional int32 end = 2; */ - public boolean hasEnd() { + @Override + public boolean hasEnd() { return ((bitField0_ & 0x00000002) == 0x00000002); } @@ -5007,5 +5165,6 @@ * optional int32 end = 2; */ - public int getEnd() { + @Override + public int getEnd() { return end_; } @@ -5046,5 +5205,6 @@ * optional string name = 1; */ - public boolean hasName() { + @Override + public boolean hasName() { return ((bitField0_ & 0x00000001) == 0x00000001); } @@ -5052,10 +5212,11 @@ * optional string name = 1; */ - public java.lang.String getName() { + @Override + public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); @@ -5069,9 +5230,10 @@ * optional string name = 1; */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); @@ -5088,5 +5250,6 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public java.util.List getFieldList() { + @Override + public java.util.List getFieldList() { return field_; } @@ -5094,5 +5257,6 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public java.util.List + @Override + public java.util.List getFieldOrBuilderList() { return field_; @@ -5101,5 +5265,6 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public int getFieldCount() { + @Override + public int getFieldCount() { return field_.size(); } @@ -5107,5 +5272,6 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getField(int index) { + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getField(int index) { return field_.get(index); } @@ -5113,5 +5279,6 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getFieldOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getFieldOrBuilder( int index) { return field_.get(index); @@ -5123,5 +5290,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public java.util.List getExtensionList() { + @Override + public java.util.List getExtensionList() { return extension_; } @@ -5129,5 +5297,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public java.util.List + @Override + public java.util.List getExtensionOrBuilderList() { return extension_; @@ -5136,5 +5305,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public int getExtensionCount() { + @Override + public int getExtensionCount() { return extension_.size(); } @@ -5142,5 +5312,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) { + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) { return extension_.get(index); } @@ -5148,5 +5319,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder( int index) { return extension_.get(index); @@ -5158,5 +5330,6 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public java.util.List getNestedTypeList() { + @Override + public java.util.List getNestedTypeList() { return nestedType_; } @@ -5164,5 +5337,6 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public java.util.List + @Override + public java.util.List getNestedTypeOrBuilderList() { return nestedType_; @@ -5171,5 +5345,6 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public int getNestedTypeCount() { + @Override + public int getNestedTypeCount() { return nestedType_.size(); } @@ -5177,5 +5352,6 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public com.google.protobuf.DescriptorProtos.DescriptorProto getNestedType(int index) { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto getNestedType(int index) { return nestedType_.get(index); } @@ -5183,5 +5359,6 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getNestedTypeOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getNestedTypeOrBuilder( int index) { return nestedType_.get(index); @@ -5193,5 +5370,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public java.util.List getEnumTypeList() { + @Override + public java.util.List getEnumTypeList() { return enumType_; } @@ -5199,5 +5377,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public java.util.List + @Override + public java.util.List getEnumTypeOrBuilderList() { return enumType_; @@ -5206,5 +5385,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public int getEnumTypeCount() { + @Override + public int getEnumTypeCount() { return enumType_.size(); } @@ -5212,5 +5392,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public com.google.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) { + @Override + public com.google.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) { return enumType_.get(index); } @@ -5218,5 +5399,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder( int index) { return enumType_.get(index); @@ -5228,5 +5410,6 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public java.util.List getExtensionRangeList() { + @Override + public java.util.List getExtensionRangeList() { return extensionRange_; } @@ -5234,5 +5417,6 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public java.util.List + @Override + public java.util.List getExtensionRangeOrBuilderList() { return extensionRange_; @@ -5241,5 +5425,6 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public int getExtensionRangeCount() { + @Override + public int getExtensionRangeCount() { return extensionRange_.size(); } @@ -5247,5 +5432,6 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getExtensionRange(int index) { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getExtensionRange(int index) { return extensionRange_.get(index); } @@ -5253,5 +5439,6 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder getExtensionRangeOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder getExtensionRangeOrBuilder( int index) { return extensionRange_.get(index); @@ -5263,5 +5450,6 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public java.util.List getOneofDeclList() { + @Override + public java.util.List getOneofDeclList() { return oneofDecl_; } @@ -5269,5 +5457,6 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public java.util.List + @Override + public java.util.List getOneofDeclOrBuilderList() { return oneofDecl_; @@ -5276,5 +5465,6 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public int getOneofDeclCount() { + @Override + public int getOneofDeclCount() { return oneofDecl_.size(); } @@ -5282,5 +5472,6 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public com.google.protobuf.DescriptorProtos.OneofDescriptorProto getOneofDecl(int index) { + @Override + public com.google.protobuf.DescriptorProtos.OneofDescriptorProto getOneofDecl(int index) { return oneofDecl_.get(index); } @@ -5288,5 +5479,6 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public com.google.protobuf.DescriptorProtos.OneofDescriptorProtoOrBuilder getOneofDeclOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.OneofDescriptorProtoOrBuilder getOneofDeclOrBuilder( int index) { return oneofDecl_.get(index); @@ -5298,5 +5490,6 @@ * optional .google.protobuf.MessageOptions options = 7; */ - public boolean hasOptions() { + @Override + public boolean hasOptions() { return ((bitField0_ & 0x00000002) == 0x00000002); } @@ -5304,5 +5497,6 @@ * optional .google.protobuf.MessageOptions options = 7; */ - public com.google.protobuf.DescriptorProtos.MessageOptions getOptions() { + @Override + public com.google.protobuf.DescriptorProtos.MessageOptions getOptions() { return options_; } @@ -5310,5 +5504,6 @@ * optional .google.protobuf.MessageOptions options = 7; */ - public com.google.protobuf.DescriptorProtos.MessageOptionsOrBuilder getOptionsOrBuilder() { + @Override + public com.google.protobuf.DescriptorProtos.MessageOptionsOrBuilder getOptionsOrBuilder() { return options_; } @@ -5325,5 +5520,6 @@ } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -5364,5 +5560,6 @@ } - public void writeTo(com.google.protobuf.CodedOutputStream output) + @Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -5395,5 +5592,6 @@ private int memoizedSerializedSize = -1; - public int getSerializedSize() { + @Override + public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; @@ -5498,9 +5696,11 @@ public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } + @Override + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.google.protobuf.DescriptorProtos.DescriptorProto prototype) { return newBuilder().mergeFrom(prototype); } - public Builder toBuilder() { return newBuilder(this); } + @Override + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -5526,5 +5726,6 @@ } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_fieldAccessorTable @@ -5558,5 +5759,6 @@ } - public Builder clear() { + @Override + public Builder clear() { super.clear(); name_ = ""; @@ -5607,18 +5809,22 @@ } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_descriptor; } - public com.google.protobuf.DescriptorProtos.DescriptorProto getDefaultInstanceForType() { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto getDefaultInstanceForType() { return com.google.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance(); } - public com.google.protobuf.DescriptorProtos.DescriptorProto build() { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto build() { com.google.protobuf.DescriptorProtos.DescriptorProto result = buildPartial(); if (!result.isInitialized()) { @@ -5628,5 +5834,6 @@ } - public com.google.protobuf.DescriptorProtos.DescriptorProto buildPartial() { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto buildPartial() { com.google.protobuf.DescriptorProtos.DescriptorProto result = new com.google.protobuf.DescriptorProtos.DescriptorProto(this); int from_bitField0_ = bitField0_; @@ -5703,5 +5910,6 @@ } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.protobuf.DescriptorProtos.DescriptorProto) { return mergeFrom((com.google.protobuf.DescriptorProtos.DescriptorProto)other); @@ -5737,5 +5945,5 @@ field_ = other.field_; bitField0_ = (bitField0_ & ~0x00000002); - fieldBuilder_ = + fieldBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getFieldFieldBuilder() : null; @@ -5763,5 +5971,5 @@ extension_ = other.extension_; bitField0_ = (bitField0_ & ~0x00000004); - extensionBuilder_ = + extensionBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getExtensionFieldBuilder() : null; @@ -5789,5 +5997,5 @@ nestedType_ = other.nestedType_; bitField0_ = (bitField0_ & ~0x00000008); - nestedTypeBuilder_ = + nestedTypeBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getNestedTypeFieldBuilder() : null; @@ -5815,5 +6023,5 @@ enumType_ = other.enumType_; bitField0_ = (bitField0_ & ~0x00000010); - enumTypeBuilder_ = + enumTypeBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getEnumTypeFieldBuilder() : null; @@ -5841,5 +6049,5 @@ extensionRange_ = other.extensionRange_; bitField0_ = (bitField0_ & ~0x00000020); - extensionRangeBuilder_ = + extensionRangeBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getExtensionRangeFieldBuilder() : null; @@ -5867,5 +6075,5 @@ oneofDecl_ = other.oneofDecl_; bitField0_ = (bitField0_ & ~0x00000040); - oneofDeclBuilder_ = + oneofDeclBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getOneofDeclFieldBuilder() : null; @@ -5882,8 +6090,9 @@ } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { for (int i = 0; i < getFieldCount(); i++) { if (!getField(i).isInitialized()) { - + return false; } @@ -5891,5 +6100,5 @@ for (int i = 0; i < getExtensionCount(); i++) { if (!getExtension(i).isInitialized()) { - + return false; } @@ -5897,5 +6106,5 @@ for (int i = 0; i < getNestedTypeCount(); i++) { if (!getNestedType(i).isInitialized()) { - + return false; } @@ -5903,5 +6112,5 @@ for (int i = 0; i < getEnumTypeCount(); i++) { if (!getEnumType(i).isInitialized()) { - + return false; } @@ -5909,5 +6118,5 @@ if (hasOptions()) { if (!getOptions().isInitialized()) { - + return false; } @@ -5916,5 +6125,6 @@ } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -5939,5 +6149,6 @@ * optional string name = 1; */ - public boolean hasName() { + @Override + public boolean hasName() { return ((bitField0_ & 0x00000001) == 0x00000001); } @@ -5945,5 +6156,6 @@ * optional string name = 1; */ - public java.lang.String getName() { + @Override + public java.lang.String getName() { java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { @@ -5962,9 +6174,10 @@ * optional string name = 1; */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); @@ -6026,5 +6239,6 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public java.util.List getFieldList() { + @Override + public java.util.List getFieldList() { if (fieldBuilder_ == null) { return java.util.Collections.unmodifiableList(field_); @@ -6036,5 +6250,6 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public int getFieldCount() { + @Override + public int getFieldCount() { if (fieldBuilder_ == null) { return field_.size(); @@ -6046,5 +6261,6 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getField(int index) { + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getField(int index) { if (fieldBuilder_ == null) { return field_.get(index); @@ -6196,5 +6412,6 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getFieldOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getFieldOrBuilder( int index) { if (fieldBuilder_ == null) { @@ -6206,5 +6423,6 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public java.util.List + @Override + public java.util.List getFieldOrBuilderList() { if (fieldBuilder_ != null) { @@ -6232,10 +6450,10 @@ * repeated .google.protobuf.FieldDescriptorProto field = 2; */ - public java.util.List + public java.util.List getFieldBuilderList() { return getFieldFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> + com.google.protobuf.DescriptorProtos.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> getFieldFieldBuilder() { if (fieldBuilder_ == null) { @@ -6265,5 +6483,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public java.util.List getExtensionList() { + @Override + public java.util.List getExtensionList() { if (extensionBuilder_ == null) { return java.util.Collections.unmodifiableList(extension_); @@ -6275,5 +6494,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public int getExtensionCount() { + @Override + public int getExtensionCount() { if (extensionBuilder_ == null) { return extension_.size(); @@ -6285,5 +6505,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) { + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) { if (extensionBuilder_ == null) { return extension_.get(index); @@ -6435,5 +6656,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder( int index) { if (extensionBuilder_ == null) { @@ -6445,5 +6667,6 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public java.util.List + @Override + public java.util.List getExtensionOrBuilderList() { if (extensionBuilder_ != null) { @@ -6471,10 +6694,10 @@ * repeated .google.protobuf.FieldDescriptorProto extension = 6; */ - public java.util.List + public java.util.List getExtensionBuilderList() { return getExtensionFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> + com.google.protobuf.DescriptorProtos.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> getExtensionFieldBuilder() { if (extensionBuilder_ == null) { @@ -6504,5 +6727,6 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public java.util.List getNestedTypeList() { + @Override + public java.util.List getNestedTypeList() { if (nestedTypeBuilder_ == null) { return java.util.Collections.unmodifiableList(nestedType_); @@ -6514,5 +6738,6 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public int getNestedTypeCount() { + @Override + public int getNestedTypeCount() { if (nestedTypeBuilder_ == null) { return nestedType_.size(); @@ -6524,5 +6749,6 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public com.google.protobuf.DescriptorProtos.DescriptorProto getNestedType(int index) { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto getNestedType(int index) { if (nestedTypeBuilder_ == null) { return nestedType_.get(index); @@ -6674,5 +6900,6 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getNestedTypeOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getNestedTypeOrBuilder( int index) { if (nestedTypeBuilder_ == null) { @@ -6684,5 +6911,6 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public java.util.List + @Override + public java.util.List getNestedTypeOrBuilderList() { if (nestedTypeBuilder_ != null) { @@ -6710,10 +6938,10 @@ * repeated .google.protobuf.DescriptorProto nested_type = 3; */ - public java.util.List + public java.util.List getNestedTypeBuilderList() { return getNestedTypeFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.DescriptorProto, com.google.protobuf.DescriptorProtos.DescriptorProto.Builder, com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> + com.google.protobuf.DescriptorProtos.DescriptorProto, com.google.protobuf.DescriptorProtos.DescriptorProto.Builder, com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> getNestedTypeFieldBuilder() { if (nestedTypeBuilder_ == null) { @@ -6743,5 +6971,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public java.util.List getEnumTypeList() { + @Override + public java.util.List getEnumTypeList() { if (enumTypeBuilder_ == null) { return java.util.Collections.unmodifiableList(enumType_); @@ -6753,5 +6982,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public int getEnumTypeCount() { + @Override + public int getEnumTypeCount() { if (enumTypeBuilder_ == null) { return enumType_.size(); @@ -6763,5 +6993,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public com.google.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) { + @Override + public com.google.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) { if (enumTypeBuilder_ == null) { return enumType_.get(index); @@ -6913,5 +7144,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder( int index) { if (enumTypeBuilder_ == null) { @@ -6923,5 +7155,6 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public java.util.List + @Override + public java.util.List getEnumTypeOrBuilderList() { if (enumTypeBuilder_ != null) { @@ -6949,10 +7182,10 @@ * repeated .google.protobuf.EnumDescriptorProto enum_type = 4; */ - public java.util.List + public java.util.List getEnumTypeBuilderList() { return getEnumTypeFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.EnumDescriptorProto, com.google.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> + com.google.protobuf.DescriptorProtos.EnumDescriptorProto, com.google.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> getEnumTypeFieldBuilder() { if (enumTypeBuilder_ == null) { @@ -6982,5 +7215,6 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public java.util.List getExtensionRangeList() { + @Override + public java.util.List getExtensionRangeList() { if (extensionRangeBuilder_ == null) { return java.util.Collections.unmodifiableList(extensionRange_); @@ -6992,5 +7226,6 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public int getExtensionRangeCount() { + @Override + public int getExtensionRangeCount() { if (extensionRangeBuilder_ == null) { return extensionRange_.size(); @@ -7002,5 +7237,6 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getExtensionRange(int index) { + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getExtensionRange(int index) { if (extensionRangeBuilder_ == null) { return extensionRange_.get(index); @@ -7152,5 +7388,6 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder getExtensionRangeOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder getExtensionRangeOrBuilder( int index) { if (extensionRangeBuilder_ == null) { @@ -7162,5 +7399,6 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public java.util.List + @Override + public java.util.List getExtensionRangeOrBuilderList() { if (extensionRangeBuilder_ != null) { @@ -7188,10 +7426,10 @@ * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; */ - public java.util.List + public java.util.List getExtensionRangeBuilderList() { return getExtensionRangeFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange, com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder, com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder> + com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange, com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder, com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder> getExtensionRangeFieldBuilder() { if (extensionRangeBuilder_ == null) { @@ -7221,5 +7459,6 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public java.util.List getOneofDeclList() { + @Override + public java.util.List getOneofDeclList() { if (oneofDeclBuilder_ == null) { return java.util.Collections.unmodifiableList(oneofDecl_); @@ -7231,5 +7470,6 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public int getOneofDeclCount() { + @Override + public int getOneofDeclCount() { if (oneofDeclBuilder_ == null) { return oneofDecl_.size(); @@ -7241,5 +7481,6 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public com.google.protobuf.DescriptorProtos.OneofDescriptorProto getOneofDecl(int index) { + @Override + public com.google.protobuf.DescriptorProtos.OneofDescriptorProto getOneofDecl(int index) { if (oneofDeclBuilder_ == null) { return oneofDecl_.get(index); @@ -7391,5 +7632,6 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public com.google.protobuf.DescriptorProtos.OneofDescriptorProtoOrBuilder getOneofDeclOrBuilder( + @Override + public com.google.protobuf.DescriptorProtos.OneofDescriptorProtoOrBuilder getOneofDeclOrBuilder( int index) { if (oneofDeclBuilder_ == null) { @@ -7401,5 +7643,6 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public java.util.List + @Override + public java.util.List getOneofDeclOrBuilderList() { if (oneofDeclBuilder_ != null) { @@ -7427,10 +7670,10 @@ * repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; */ - public java.util.List + public java.util.List getOneofDeclBuilderList() { return getOneofDeclFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.google.protobuf.DescriptorProtos.OneofDescriptorProto, com.google.protobuf.DescriptorProtos.OneofDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.OneofDescriptorProtoOrBuilder> + com.google.protobuf.DescriptorProtos.OneofDescriptorProto, com.google.protobuf.DescriptorProtos.OneofDescriptorProto.Builder, com.google.protobuf.DescriptorProtos.OneofDescriptorProtoOrBuilder> getOneofDeclFieldBuilder() { if (oneofDeclBuilder_ == null) { @@ -7451,5 +7694,6 @@ * optional .google.protobuf.MessageOptions options = 7; */ - public boolean hasOptions() { + @Override + public boolean hasOptions() { return ((bitField0_ & 0x00000080) == 0x00000080); } @@ -7457,5 +7701,6 @@ * optional .google.protobuf.MessageOptions options = 7; */ - public com.google.protobuf.DescriptorProtos.MessageOptions getOptions() { + @Override + public com.google.protobuf.DescriptorProtos.MessageOptions getOptions() { if (optionsBuilder_ == null) { return options_; @@ -7537,5 +7782,6 @@ * optional .google.protobuf.MessageOptions options = 7; */ - public com.google.protobuf.DescriptorProtos.MessageOptionsOrBuilder getOptionsOrBuilder() { + @Override + public com.google.protobuf.DescriptorProtos.MessageOptionsOrBuilder getOptionsOrBuilder() { if (optionsBuilder_ != null) { return optionsBuilder_.getMessageOrBuilder(); @@ -7548,5 +7794,5 @@ */ private com.google.protobuf.SingleFieldBuilder< - com.google.protobuf.DescriptorProtos.MessageOptions, com.google.protobuf.DescriptorProtos.MessageOptions.Builder, com.google.protobuf.DescriptorProtos.MessageOptionsOrBuilder> + com.google.protobuf.DescriptorProtos.MessageOptions, com.google.protobuf.DescriptorProtos.MessageOptions.Builder, com.google.protobuf.DescriptorProtos.MessageOptionsOrBuilder> getOptionsFieldBuilder() { if (optionsBuilder_ == null) { @@ -7790,5 +8036,6 @@ } - public FieldDescriptorProto getDefaultInstanceForType() { + @Override + public FieldDescriptorProto getDefaultInstanceForType() { return defaultInstance; } @@ -7909,5 +8156,6 @@ } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.protobuf.DescriptorProtos.internal_static_google_protobuf_FieldDescriptorProto_fieldAccessorTable @@ -7918,5 +8166,6 @@ public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public FieldDescriptorProto parsePartialFrom( + @Override + public FieldDescriptorProto parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -8154,5 +8403,6 @@ - public final int getNumber() { return value; } + @Override + public final int getNumber() { return value; } public static Type valueOf(int value) { @@ -8187,14 +8437,17 @@ internalValueMap = new com.google.protobuf.Internal.EnumLiteMap() { - public Type findValueByNumber(int number) { + @Override + public Type findValueByNumber(int number) { return Type.valueOf(number); } }; - public final com.google.protobuf.Descriptors.EnumValueDescriptor + @Override + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); } - public final com.google.protobuf.Descriptors.EnumDescriptor + @Override + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { return getDescriptor(); @@ -8276,5 +8529,6 @@ - public final int getNumber() { return value; } + @Override + public final int getNumber() { return value; } public static Label valueOf(int value) { @@ -8294,14 +8548,17 @@ internalValueMap = new com.google.protobuf.Internal.EnumLiteMap