uninterpretedOption_;
@@ -19223,5 +20613,6 @@
private void initFields() {
- allowAlias_ = true;
+ allowAlias_ = false;
+ deprecated_ = false;
uninterpretedOption_ = java.util.Collections.emptyList();
}
@@ -19229,5 +20620,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getUninterpretedOptionCount(); i++) {
@@ -19254,4 +20646,7 @@
output.writeBool(2, allowAlias_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeBool(3, deprecated_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
output.writeMessage(999, uninterpretedOption_.get(i));
@@ -19270,4 +20665,8 @@
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(2, allowAlias_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(3, deprecated_);
}
for (int i = 0; i < uninterpretedOption_.size(); i++) {
@@ -19359,5 +20758,7 @@
public static final class Builder extends
com.google.protobuf.GeneratedMessage.ExtendableBuilder<
- com.google.protobuf.DescriptorProtos.EnumOptions, Builder> implements com.google.protobuf.DescriptorProtos.EnumOptionsOrBuilder {
+ com.google.protobuf.DescriptorProtos.EnumOptions, Builder> implements
+ // @@protoc_insertion_point(builder_implements:google.protobuf.EnumOptions)
+ com.google.protobuf.DescriptorProtos.EnumOptionsOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
@@ -19393,9 +20794,11 @@
public Builder clear() {
super.clear();
- allowAlias_ = true;
+ allowAlias_ = false;
bitField0_ = (bitField0_ & ~0x00000001);
+ deprecated_ = false;
+ bitField0_ = (bitField0_ & ~0x00000002);
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000004);
} else {
uninterpretedOptionBuilder_.clear();
@@ -19433,8 +20836,12 @@
}
result.allowAlias_ = allowAlias_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.deprecated_ = deprecated_;
if (uninterpretedOptionBuilder_ == null) {
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000004);
}
result.uninterpretedOption_ = uninterpretedOption_;
@@ -19461,9 +20868,12 @@
setAllowAlias(other.getAllowAlias());
}
+ if (other.hasDeprecated()) {
+ setDeprecated(other.getDeprecated());
+ }
if (uninterpretedOptionBuilder_ == null) {
if (!other.uninterpretedOption_.isEmpty()) {
if (uninterpretedOption_.isEmpty()) {
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000004);
} else {
ensureUninterpretedOptionIsMutable();
@@ -19478,5 +20888,5 @@
uninterpretedOptionBuilder_ = null;
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000004);
uninterpretedOptionBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
@@ -19525,11 +20935,10 @@
private int bitField0_;
- // optional bool allow_alias = 2 [default = true];
- private boolean allowAlias_ = true;
- /**
- * optional bool allow_alias = 2 [default = true];
- *
- *
- * Set this option to false to disallow mapping different tag names to a same
+ private boolean allowAlias_ ;
+ /**
+ * optional bool allow_alias = 2;
+ *
+ *
+ * Set this option to true to allow mapping different tag names to the same
* value.
*
@@ -19539,8 +20948,8 @@
}
/**
- * optional bool allow_alias = 2 [default = true];
- *
- *
- * Set this option to false to disallow mapping different tag names to a same
+ * optional bool allow_alias = 2;
+ *
+ *
+ * Set this option to true to allow mapping different tag names to the same
* value.
*
@@ -19550,8 +20959,8 @@
}
/**
- * optional bool allow_alias = 2 [default = true];
- *
- *
- * Set this option to false to disallow mapping different tag names to a same
+ * optional bool allow_alias = 2;
+ *
+ *
+ * Set this option to true to allow mapping different tag names to the same
* value.
*
@@ -19564,8 +20973,8 @@
}
/**
- * optional bool allow_alias = 2 [default = true];
- *
- *
- * Set this option to false to disallow mapping different tag names to a same
+ * optional bool allow_alias = 2;
+ *
+ *
+ * Set this option to true to allow mapping different tag names to the same
* value.
*
@@ -19573,16 +20982,75 @@
public Builder clearAllowAlias() {
bitField0_ = (bitField0_ & ~0x00000001);
- allowAlias_ = true;
+ allowAlias_ = false;
onChanged();
return this;
}
- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
+ private boolean deprecated_ ;
+ /**
+ * optional bool deprecated = 3 [default = false];
+ *
+ *
+ * Is this enum deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum, or it will be completely ignored; in the very least, this
+ * is a formalization for deprecating enums.
+ *
+ */
+ public boolean hasDeprecated() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * optional bool deprecated = 3 [default = false];
+ *
+ *
+ * Is this enum deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum, or it will be completely ignored; in the very least, this
+ * is a formalization for deprecating enums.
+ *
+ */
+ public boolean getDeprecated() {
+ return deprecated_;
+ }
+ /**
+ * optional bool deprecated = 3 [default = false];
+ *
+ *
+ * Is this enum deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum, or it will be completely ignored; in the very least, this
+ * is a formalization for deprecating enums.
+ *
+ */
+ public Builder setDeprecated(boolean value) {
+ bitField0_ |= 0x00000002;
+ deprecated_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional bool deprecated = 3 [default = false];
+ *
+ *
+ * Is this enum deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum, or it will be completely ignored; in the very least, this
+ * is a formalization for deprecating enums.
+ *
+ */
+ public Builder clearDeprecated() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ deprecated_ = false;
+ onChanged();
+ return this;
+ }
+
private java.util.List uninterpretedOption_ =
java.util.Collections.emptyList();
private void ensureUninterpretedOptionIsMutable() {
- if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+ if (!((bitField0_ & 0x00000004) == 0x00000004)) {
uninterpretedOption_ = new java.util.ArrayList(uninterpretedOption_);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
}
}
@@ -19760,5 +21228,6 @@
if (uninterpretedOptionBuilder_ == null) {
ensureUninterpretedOptionIsMutable();
- super.addAll(values, uninterpretedOption_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, uninterpretedOption_);
onChanged();
} else {
@@ -19777,5 +21246,5 @@
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000004);
onChanged();
} else {
@@ -19882,5 +21351,5 @@
com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>(
uninterpretedOption_,
- ((bitField0_ & 0x00000002) == 0x00000002),
+ ((bitField0_ & 0x00000004) == 0x00000004),
getParentForChildren(),
isClean());
@@ -19902,8 +21371,31 @@
public interface EnumValueOptionsOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:google.protobuf.EnumValueOptions)
com.google.protobuf.GeneratedMessage.
ExtendableMessageOrBuilder {
- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
+ /**
+ * optional bool deprecated = 1 [default = false];
+ *
+ *
+ * Is this enum value deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum value, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating enum values.
+ *
+ */
+ boolean hasDeprecated();
+ /**
+ * optional bool deprecated = 1 [default = false];
+ *
+ *
+ * Is this enum value deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum value, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating enum values.
+ *
+ */
+ boolean getDeprecated();
+
/**
* repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -19955,5 +21447,7 @@
public static final class EnumValueOptions extends
com.google.protobuf.GeneratedMessage.ExtendableMessage<
- EnumValueOptions> implements EnumValueOptionsOrBuilder {
+ EnumValueOptions> implements
+ // @@protoc_insertion_point(message_implements:google.protobuf.EnumValueOptions)
+ EnumValueOptionsOrBuilder {
// Use EnumValueOptions.newBuilder() to construct.
private EnumValueOptions(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
@@ -20001,8 +21495,13 @@
break;
}
+ case 8: {
+ bitField0_ |= 0x00000001;
+ deprecated_ = input.readBool();
+ break;
+ }
case 7994: {
- if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+ if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000001;
+ mutable_bitField0_ |= 0x00000002;
}
uninterpretedOption_.add(input.readMessage(com.google.protobuf.DescriptorProtos.UninterpretedOption.PARSER, extensionRegistry));
@@ -20017,5 +21516,5 @@
e.getMessage()).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+ if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
}
@@ -20051,5 +21550,34 @@
}
- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
+ private int bitField0_;
+ public static final int DEPRECATED_FIELD_NUMBER = 1;
+ private boolean deprecated_;
+ /**
+ * optional bool deprecated = 1 [default = false];
+ *
+ *
+ * Is this enum value deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum value, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating enum values.
+ *
+ */
+ public boolean hasDeprecated() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional bool deprecated = 1 [default = false];
+ *
+ *
+ * Is this enum value deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum value, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating enum values.
+ *
+ */
+ public boolean getDeprecated() {
+ return deprecated_;
+ }
+
public static final int UNINTERPRETED_OPTION_FIELD_NUMBER = 999;
private java.util.List uninterpretedOption_;
@@ -20108,4 +21636,5 @@
private void initFields() {
+ deprecated_ = false;
uninterpretedOption_ = java.util.Collections.emptyList();
}
@@ -20113,5 +21642,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getUninterpretedOptionCount(); i++) {
@@ -20135,4 +21665,7 @@
.ExtendableMessage.ExtensionWriter extensionWriter =
newExtensionWriter();
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeBool(1, deprecated_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
output.writeMessage(999, uninterpretedOption_.get(i));
@@ -20148,4 +21681,8 @@
size = 0;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(1, deprecated_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
@@ -20236,5 +21773,7 @@
public static final class Builder extends
com.google.protobuf.GeneratedMessage.ExtendableBuilder<
- com.google.protobuf.DescriptorProtos.EnumValueOptions, Builder> implements com.google.protobuf.DescriptorProtos.EnumValueOptionsOrBuilder {
+ com.google.protobuf.DescriptorProtos.EnumValueOptions, Builder> implements
+ // @@protoc_insertion_point(builder_implements:google.protobuf.EnumValueOptions)
+ com.google.protobuf.DescriptorProtos.EnumValueOptionsOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
@@ -20270,7 +21809,9 @@
public Builder clear() {
super.clear();
+ deprecated_ = false;
+ bitField0_ = (bitField0_ & ~0x00000001);
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
} else {
uninterpretedOptionBuilder_.clear();
@@ -20303,8 +21844,13 @@
com.google.protobuf.DescriptorProtos.EnumValueOptions result = new com.google.protobuf.DescriptorProtos.EnumValueOptions(this);
int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.deprecated_ = deprecated_;
if (uninterpretedOptionBuilder_ == null) {
- if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
}
result.uninterpretedOption_ = uninterpretedOption_;
@@ -20312,4 +21858,5 @@
result.uninterpretedOption_ = uninterpretedOptionBuilder_.build();
}
+ result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -20327,9 +21874,12 @@
public Builder mergeFrom(com.google.protobuf.DescriptorProtos.EnumValueOptions other) {
if (other == com.google.protobuf.DescriptorProtos.EnumValueOptions.getDefaultInstance()) return this;
+ if (other.hasDeprecated()) {
+ setDeprecated(other.getDeprecated());
+ }
if (uninterpretedOptionBuilder_ == null) {
if (!other.uninterpretedOption_.isEmpty()) {
if (uninterpretedOption_.isEmpty()) {
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
} else {
ensureUninterpretedOptionIsMutable();
@@ -20344,5 +21894,5 @@
uninterpretedOptionBuilder_ = null;
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
uninterpretedOptionBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
@@ -20391,11 +21941,70 @@
private int bitField0_;
- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
+ private boolean deprecated_ ;
+ /**
+ * optional bool deprecated = 1 [default = false];
+ *
+ *
+ * Is this enum value deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum value, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating enum values.
+ *
+ */
+ public boolean hasDeprecated() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional bool deprecated = 1 [default = false];
+ *
+ *
+ * Is this enum value deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum value, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating enum values.
+ *
+ */
+ public boolean getDeprecated() {
+ return deprecated_;
+ }
+ /**
+ * optional bool deprecated = 1 [default = false];
+ *
+ *
+ * Is this enum value deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum value, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating enum values.
+ *
+ */
+ public Builder setDeprecated(boolean value) {
+ bitField0_ |= 0x00000001;
+ deprecated_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional bool deprecated = 1 [default = false];
+ *
+ *
+ * Is this enum value deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the enum value, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating enum values.
+ *
+ */
+ public Builder clearDeprecated() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ deprecated_ = false;
+ onChanged();
+ return this;
+ }
+
private java.util.List uninterpretedOption_ =
java.util.Collections.emptyList();
private void ensureUninterpretedOptionIsMutable() {
- if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+ if (!((bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = new java.util.ArrayList(uninterpretedOption_);
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
}
@@ -20573,5 +22182,6 @@
if (uninterpretedOptionBuilder_ == null) {
ensureUninterpretedOptionIsMutable();
- super.addAll(values, uninterpretedOption_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, uninterpretedOption_);
onChanged();
} else {
@@ -20590,5 +22200,5 @@
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
} else {
@@ -20695,5 +22305,5 @@
com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>(
uninterpretedOption_,
- ((bitField0_ & 0x00000001) == 0x00000001),
+ ((bitField0_ & 0x00000002) == 0x00000002),
getParentForChildren(),
isClean());
@@ -20715,8 +22325,31 @@
public interface ServiceOptionsOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:google.protobuf.ServiceOptions)
com.google.protobuf.GeneratedMessage.
ExtendableMessageOrBuilder {
- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this service deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the service, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating services.
+ *
+ */
+ boolean hasDeprecated();
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this service deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the service, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating services.
+ *
+ */
+ boolean getDeprecated();
+
/**
* repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -20768,5 +22401,7 @@
public static final class ServiceOptions extends
com.google.protobuf.GeneratedMessage.ExtendableMessage<
- ServiceOptions> implements ServiceOptionsOrBuilder {
+ ServiceOptions> implements
+ // @@protoc_insertion_point(message_implements:google.protobuf.ServiceOptions)
+ ServiceOptionsOrBuilder {
// Use ServiceOptions.newBuilder() to construct.
private ServiceOptions(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
@@ -20814,8 +22449,13 @@
break;
}
+ case 264: {
+ bitField0_ |= 0x00000001;
+ deprecated_ = input.readBool();
+ break;
+ }
case 7994: {
- if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+ if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000001;
+ mutable_bitField0_ |= 0x00000002;
}
uninterpretedOption_.add(input.readMessage(com.google.protobuf.DescriptorProtos.UninterpretedOption.PARSER, extensionRegistry));
@@ -20830,5 +22470,5 @@
e.getMessage()).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+ if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
}
@@ -20864,5 +22504,34 @@
}
- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
+ private int bitField0_;
+ public static final int DEPRECATED_FIELD_NUMBER = 33;
+ private boolean deprecated_;
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this service deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the service, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating services.
+ *
+ */
+ public boolean hasDeprecated() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this service deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the service, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating services.
+ *
+ */
+ public boolean getDeprecated() {
+ return deprecated_;
+ }
+
public static final int UNINTERPRETED_OPTION_FIELD_NUMBER = 999;
private java.util.List uninterpretedOption_;
@@ -20921,4 +22590,5 @@
private void initFields() {
+ deprecated_ = false;
uninterpretedOption_ = java.util.Collections.emptyList();
}
@@ -20926,5 +22596,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getUninterpretedOptionCount(); i++) {
@@ -20948,4 +22619,7 @@
.ExtendableMessage.ExtensionWriter extensionWriter =
newExtensionWriter();
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeBool(33, deprecated_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
output.writeMessage(999, uninterpretedOption_.get(i));
@@ -20961,4 +22635,8 @@
size = 0;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(33, deprecated_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
@@ -21049,5 +22727,7 @@
public static final class Builder extends
com.google.protobuf.GeneratedMessage.ExtendableBuilder<
- com.google.protobuf.DescriptorProtos.ServiceOptions, Builder> implements com.google.protobuf.DescriptorProtos.ServiceOptionsOrBuilder {
+ com.google.protobuf.DescriptorProtos.ServiceOptions, Builder> implements
+ // @@protoc_insertion_point(builder_implements:google.protobuf.ServiceOptions)
+ com.google.protobuf.DescriptorProtos.ServiceOptionsOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
@@ -21083,7 +22763,9 @@
public Builder clear() {
super.clear();
+ deprecated_ = false;
+ bitField0_ = (bitField0_ & ~0x00000001);
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
} else {
uninterpretedOptionBuilder_.clear();
@@ -21116,8 +22798,13 @@
com.google.protobuf.DescriptorProtos.ServiceOptions result = new com.google.protobuf.DescriptorProtos.ServiceOptions(this);
int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.deprecated_ = deprecated_;
if (uninterpretedOptionBuilder_ == null) {
- if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
}
result.uninterpretedOption_ = uninterpretedOption_;
@@ -21125,4 +22812,5 @@
result.uninterpretedOption_ = uninterpretedOptionBuilder_.build();
}
+ result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -21140,9 +22828,12 @@
public Builder mergeFrom(com.google.protobuf.DescriptorProtos.ServiceOptions other) {
if (other == com.google.protobuf.DescriptorProtos.ServiceOptions.getDefaultInstance()) return this;
+ if (other.hasDeprecated()) {
+ setDeprecated(other.getDeprecated());
+ }
if (uninterpretedOptionBuilder_ == null) {
if (!other.uninterpretedOption_.isEmpty()) {
if (uninterpretedOption_.isEmpty()) {
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
} else {
ensureUninterpretedOptionIsMutable();
@@ -21157,5 +22848,5 @@
uninterpretedOptionBuilder_ = null;
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
uninterpretedOptionBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
@@ -21204,11 +22895,70 @@
private int bitField0_;
- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
+ private boolean deprecated_ ;
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this service deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the service, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating services.
+ *
+ */
+ public boolean hasDeprecated() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this service deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the service, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating services.
+ *
+ */
+ public boolean getDeprecated() {
+ return deprecated_;
+ }
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this service deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the service, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating services.
+ *
+ */
+ public Builder setDeprecated(boolean value) {
+ bitField0_ |= 0x00000001;
+ deprecated_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this service deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the service, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating services.
+ *
+ */
+ public Builder clearDeprecated() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ deprecated_ = false;
+ onChanged();
+ return this;
+ }
+
private java.util.List uninterpretedOption_ =
java.util.Collections.emptyList();
private void ensureUninterpretedOptionIsMutable() {
- if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+ if (!((bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = new java.util.ArrayList(uninterpretedOption_);
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
}
@@ -21386,5 +23136,6 @@
if (uninterpretedOptionBuilder_ == null) {
ensureUninterpretedOptionIsMutable();
- super.addAll(values, uninterpretedOption_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, uninterpretedOption_);
onChanged();
} else {
@@ -21403,5 +23154,5 @@
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
} else {
@@ -21508,5 +23259,5 @@
com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>(
uninterpretedOption_,
- ((bitField0_ & 0x00000001) == 0x00000001),
+ ((bitField0_ & 0x00000002) == 0x00000002),
getParentForChildren(),
isClean());
@@ -21528,8 +23279,31 @@
public interface MethodOptionsOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:google.protobuf.MethodOptions)
com.google.protobuf.GeneratedMessage.
ExtendableMessageOrBuilder {
- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this method deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the method, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating methods.
+ *
+ */
+ boolean hasDeprecated();
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this method deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the method, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating methods.
+ *
+ */
+ boolean getDeprecated();
+
/**
* repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -21581,5 +23355,7 @@
public static final class MethodOptions extends
com.google.protobuf.GeneratedMessage.ExtendableMessage<
- MethodOptions> implements MethodOptionsOrBuilder {
+ MethodOptions> implements
+ // @@protoc_insertion_point(message_implements:google.protobuf.MethodOptions)
+ MethodOptionsOrBuilder {
// Use MethodOptions.newBuilder() to construct.
private MethodOptions(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
@@ -21627,8 +23403,13 @@
break;
}
+ case 264: {
+ bitField0_ |= 0x00000001;
+ deprecated_ = input.readBool();
+ break;
+ }
case 7994: {
- if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+ if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000001;
+ mutable_bitField0_ |= 0x00000002;
}
uninterpretedOption_.add(input.readMessage(com.google.protobuf.DescriptorProtos.UninterpretedOption.PARSER, extensionRegistry));
@@ -21643,5 +23424,5 @@
e.getMessage()).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+ if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
}
@@ -21677,5 +23458,34 @@
}
- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
+ private int bitField0_;
+ public static final int DEPRECATED_FIELD_NUMBER = 33;
+ private boolean deprecated_;
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this method deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the method, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating methods.
+ *
+ */
+ public boolean hasDeprecated() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this method deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the method, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating methods.
+ *
+ */
+ public boolean getDeprecated() {
+ return deprecated_;
+ }
+
public static final int UNINTERPRETED_OPTION_FIELD_NUMBER = 999;
private java.util.List uninterpretedOption_;
@@ -21734,4 +23544,5 @@
private void initFields() {
+ deprecated_ = false;
uninterpretedOption_ = java.util.Collections.emptyList();
}
@@ -21739,5 +23550,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getUninterpretedOptionCount(); i++) {
@@ -21761,4 +23573,7 @@
.ExtendableMessage.ExtensionWriter extensionWriter =
newExtensionWriter();
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeBool(33, deprecated_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
output.writeMessage(999, uninterpretedOption_.get(i));
@@ -21774,4 +23589,8 @@
size = 0;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(33, deprecated_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
@@ -21862,5 +23681,7 @@
public static final class Builder extends
com.google.protobuf.GeneratedMessage.ExtendableBuilder<
- com.google.protobuf.DescriptorProtos.MethodOptions, Builder> implements com.google.protobuf.DescriptorProtos.MethodOptionsOrBuilder {
+ com.google.protobuf.DescriptorProtos.MethodOptions, Builder> implements
+ // @@protoc_insertion_point(builder_implements:google.protobuf.MethodOptions)
+ com.google.protobuf.DescriptorProtos.MethodOptionsOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
@@ -21896,7 +23717,9 @@
public Builder clear() {
super.clear();
+ deprecated_ = false;
+ bitField0_ = (bitField0_ & ~0x00000001);
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
} else {
uninterpretedOptionBuilder_.clear();
@@ -21929,8 +23752,13 @@
com.google.protobuf.DescriptorProtos.MethodOptions result = new com.google.protobuf.DescriptorProtos.MethodOptions(this);
int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.deprecated_ = deprecated_;
if (uninterpretedOptionBuilder_ == null) {
- if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
}
result.uninterpretedOption_ = uninterpretedOption_;
@@ -21938,4 +23766,5 @@
result.uninterpretedOption_ = uninterpretedOptionBuilder_.build();
}
+ result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -21953,9 +23782,12 @@
public Builder mergeFrom(com.google.protobuf.DescriptorProtos.MethodOptions other) {
if (other == com.google.protobuf.DescriptorProtos.MethodOptions.getDefaultInstance()) return this;
+ if (other.hasDeprecated()) {
+ setDeprecated(other.getDeprecated());
+ }
if (uninterpretedOptionBuilder_ == null) {
if (!other.uninterpretedOption_.isEmpty()) {
if (uninterpretedOption_.isEmpty()) {
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
} else {
ensureUninterpretedOptionIsMutable();
@@ -21970,5 +23802,5 @@
uninterpretedOptionBuilder_ = null;
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
uninterpretedOptionBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
@@ -22017,11 +23849,70 @@
private int bitField0_;
- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
+ private boolean deprecated_ ;
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this method deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the method, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating methods.
+ *
+ */
+ public boolean hasDeprecated() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this method deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the method, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating methods.
+ *
+ */
+ public boolean getDeprecated() {
+ return deprecated_;
+ }
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this method deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the method, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating methods.
+ *
+ */
+ public Builder setDeprecated(boolean value) {
+ bitField0_ |= 0x00000001;
+ deprecated_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional bool deprecated = 33 [default = false];
+ *
+ *
+ * Is this method deprecated?
+ * Depending on the target platform, this can emit Deprecated annotations
+ * for the method, or it will be completely ignored; in the very least,
+ * this is a formalization for deprecating methods.
+ *
+ */
+ public Builder clearDeprecated() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ deprecated_ = false;
+ onChanged();
+ return this;
+ }
+
private java.util.List uninterpretedOption_ =
java.util.Collections.emptyList();
private void ensureUninterpretedOptionIsMutable() {
- if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+ if (!((bitField0_ & 0x00000002) == 0x00000002)) {
uninterpretedOption_ = new java.util.ArrayList(uninterpretedOption_);
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
}
@@ -22199,5 +24090,6 @@
if (uninterpretedOptionBuilder_ == null) {
ensureUninterpretedOptionIsMutable();
- super.addAll(values, uninterpretedOption_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, uninterpretedOption_);
onChanged();
} else {
@@ -22216,5 +24108,5 @@
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
} else {
@@ -22321,5 +24213,5 @@
com.google.protobuf.DescriptorProtos.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>(
uninterpretedOption_,
- ((bitField0_ & 0x00000001) == 0x00000001),
+ ((bitField0_ & 0x00000002) == 0x00000002),
getParentForChildren(),
isClean());
@@ -22340,8 +24232,8 @@
}
- public interface UninterpretedOptionOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
-
- // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
+ public interface UninterpretedOptionOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:google.protobuf.UninterpretedOption)
+ com.google.protobuf.MessageOrBuilder {
+
/**
* repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
@@ -22368,5 +24260,4 @@
int index);
- // optional string identifier_value = 3;
/**
* optional string identifier_value = 3;
@@ -22398,5 +24289,4 @@
getIdentifierValueBytes();
- // optional uint64 positive_int_value = 4;
/**
* optional uint64 positive_int_value = 4;
@@ -22408,5 +24298,4 @@
long getPositiveIntValue();
- // optional int64 negative_int_value = 5;
/**
* optional int64 negative_int_value = 5;
@@ -22418,5 +24307,4 @@
long getNegativeIntValue();
- // optional double double_value = 6;
/**
* optional double double_value = 6;
@@ -22428,5 +24316,4 @@
double getDoubleValue();
- // optional bytes string_value = 7;
/**
* optional bytes string_value = 7;
@@ -22438,5 +24325,4 @@
com.google.protobuf.ByteString getStringValue();
- // optional string aggregate_value = 8;
/**
* optional string aggregate_value = 8;
@@ -22466,6 +24352,7 @@
*/
public static final class UninterpretedOption extends
- com.google.protobuf.GeneratedMessage
- implements UninterpretedOptionOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:google.protobuf.UninterpretedOption)
+ UninterpretedOptionOrBuilder {
// Use UninterpretedOption.newBuilder() to construct.
private UninterpretedOption(com.google.protobuf.GeneratedMessage.Builder builder) {
@@ -22522,6 +24409,7 @@
}
case 26: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- identifierValue_ = input.readBytes();
+ identifierValue_ = bs;
break;
}
@@ -22547,6 +24435,7 @@
}
case 66: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000020;
- aggregateValue_ = input.readBytes();
+ aggregateValue_ = bs;
break;
}
@@ -22593,8 +24482,8 @@
}
- public interface NamePartOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
-
- // required string name_part = 1;
+ public interface NamePartOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:google.protobuf.UninterpretedOption.NamePart)
+ com.google.protobuf.MessageOrBuilder {
+
/**
* required string name_part = 1;
@@ -22611,5 +24500,4 @@
getNamePartBytes();
- // required bool is_extension = 2;
/**
* required bool is_extension = 2;
@@ -22633,6 +24521,7 @@
*/
public static final class NamePart extends
- com.google.protobuf.GeneratedMessage
- implements NamePartOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:google.protobuf.UninterpretedOption.NamePart)
+ NamePartOrBuilder {
// Use NamePart.newBuilder() to construct.
private NamePart(com.google.protobuf.GeneratedMessage.Builder builder) {
@@ -22681,6 +24570,7 @@
}
case 10: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- namePart_ = input.readBytes();
+ namePart_ = bs;
break;
}
@@ -22730,5 +24620,4 @@
private int bitField0_;
- // required string name_part = 1;
public static final int NAME_PART_FIELD_NUMBER = 1;
private java.lang.Object namePart_;
@@ -22773,5 +24662,4 @@
}
- // required bool is_extension = 2;
public static final int IS_EXTENSION_FIELD_NUMBER = 2;
private boolean isExtension_;
@@ -22796,5 +24684,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasNamePart()) {
@@ -22926,6 +24815,7 @@
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder
- implements com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePartOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:google.protobuf.UninterpretedOption.NamePart)
+ com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePartOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
@@ -23059,5 +24949,4 @@
private int bitField0_;
- // required string name_part = 1;
private java.lang.Object namePart_ = "";
/**
@@ -23073,7 +24962,10 @@
java.lang.Object ref = namePart_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- namePart_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ namePart_ = s;
+ }
return s;
} else {
@@ -23133,5 +25025,4 @@
}
- // required bool is_extension = 2;
private boolean isExtension_ ;
/**
@@ -23178,5 +25069,4 @@
private int bitField0_;
- // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
public static final int NAME_FIELD_NUMBER = 2;
private java.util.List name_;
@@ -23214,5 +25104,4 @@
}
- // optional string identifier_value = 3;
public static final int IDENTIFIER_VALUE_FIELD_NUMBER = 3;
private java.lang.Object identifierValue_;
@@ -23272,5 +25161,4 @@
}
- // optional uint64 positive_int_value = 4;
public static final int POSITIVE_INT_VALUE_FIELD_NUMBER = 4;
private long positiveIntValue_;
@@ -23288,5 +25176,4 @@
}
- // optional int64 negative_int_value = 5;
public static final int NEGATIVE_INT_VALUE_FIELD_NUMBER = 5;
private long negativeIntValue_;
@@ -23304,5 +25191,4 @@
}
- // optional double double_value = 6;
public static final int DOUBLE_VALUE_FIELD_NUMBER = 6;
private double doubleValue_;
@@ -23320,5 +25206,4 @@
}
- // optional bytes string_value = 7;
public static final int STRING_VALUE_FIELD_NUMBER = 7;
private com.google.protobuf.ByteString stringValue_;
@@ -23336,5 +25221,4 @@
}
- // optional string aggregate_value = 8;
public static final int AGGREGATE_VALUE_FIELD_NUMBER = 8;
private java.lang.Object aggregateValue_;
@@ -23391,5 +25275,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getNameCount(); i++) {
@@ -23555,6 +25440,7 @@
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder
- implements com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:google.protobuf.UninterpretedOption)
+ com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
@@ -23766,5 +25652,4 @@
private int bitField0_;
- // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
private java.util.List name_ =
java.util.Collections.emptyList();
@@ -23908,5 +25793,6 @@
if (nameBuilder_ == null) {
ensureNameIsMutable();
- super.addAll(values, name_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, name_);
onChanged();
} else {
@@ -24006,5 +25892,4 @@
}
- // optional string identifier_value = 3;
private java.lang.Object identifierValue_ = "";
/**
@@ -24030,7 +25915,10 @@
java.lang.Object ref = identifierValue_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- identifierValue_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ identifierValue_ = s;
+ }
return s;
} else {
@@ -24110,5 +25998,4 @@
}
- // optional uint64 positive_int_value = 4;
private long positiveIntValue_ ;
/**
@@ -24143,5 +26030,4 @@
}
- // optional int64 negative_int_value = 5;
private long negativeIntValue_ ;
/**
@@ -24176,5 +26062,4 @@
}
- // optional double double_value = 6;
private double doubleValue_ ;
/**
@@ -24209,5 +26094,4 @@
}
- // optional bytes string_value = 7;
private com.google.protobuf.ByteString stringValue_ = com.google.protobuf.ByteString.EMPTY;
/**
@@ -24245,5 +26129,4 @@
}
- // optional string aggregate_value = 8;
private java.lang.Object aggregateValue_ = "";
/**
@@ -24259,7 +26142,10 @@
java.lang.Object ref = aggregateValue_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- aggregateValue_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ aggregateValue_ = s;
+ }
return s;
} else {
@@ -24330,8 +26216,8 @@
}
- public interface SourceCodeInfoOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
-
- // repeated .google.protobuf.SourceCodeInfo.Location location = 1;
+ public interface SourceCodeInfoOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:google.protobuf.SourceCodeInfo)
+ com.google.protobuf.MessageOrBuilder {
+
/**
* repeated .google.protobuf.SourceCodeInfo.Location location = 1;
@@ -24342,5 +26228,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -24358,5 +26243,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -24393,5 +26277,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -24409,5 +26292,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -24443,5 +26325,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -24459,5 +26340,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -24493,5 +26373,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -24509,5 +26388,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -24544,5 +26422,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -24560,5 +26437,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -24597,6 +26473,7 @@
*/
public static final class SourceCodeInfo extends
- com.google.protobuf.GeneratedMessage
- implements SourceCodeInfoOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:google.protobuf.SourceCodeInfo)
+ SourceCodeInfoOrBuilder {
// Use SourceCodeInfo.newBuilder() to construct.
private SourceCodeInfo(com.google.protobuf.GeneratedMessage.Builder builder) {
@@ -24694,8 +26571,8 @@
}
- public interface LocationOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
-
- // repeated int32 path = 1 [packed = true];
+ public interface LocationOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:google.protobuf.SourceCodeInfo.Location)
+ com.google.protobuf.MessageOrBuilder {
+
/**
* repeated int32 path = 1 [packed = true];
@@ -24704,5 +26581,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -24719,5 +26595,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -24734,5 +26609,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -24749,5 +26623,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -24764,5 +26637,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -24779,5 +26651,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -24789,5 +26660,4 @@
int getPath(int index);
- // repeated int32 span = 2 [packed = true];
/**
* repeated int32 span = 2 [packed = true];
@@ -24827,5 +26697,4 @@
int getSpan(int index);
- // optional string leading_comments = 3;
/**
* optional string leading_comments = 3;
@@ -24835,28 +26704,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -24876,28 +26738,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -24917,28 +26772,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -24953,5 +26801,4 @@
getLeadingCommentsBytes();
- // optional string trailing_comments = 4;
/**
* optional string trailing_comments = 4;
@@ -24972,6 +26819,7 @@
*/
public static final class Location extends
- com.google.protobuf.GeneratedMessage
- implements LocationOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:google.protobuf.SourceCodeInfo.Location)
+ LocationOrBuilder {
// Use Location.newBuilder() to construct.
private Location(com.google.protobuf.GeneratedMessage.Builder builder) {
@@ -25062,11 +26910,13 @@
}
case 26: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- leadingComments_ = input.readBytes();
+ leadingComments_ = bs;
break;
}
case 34: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000002;
- trailingComments_ = input.readBytes();
+ trailingComments_ = bs;
break;
}
@@ -25117,5 +26967,4 @@
private int bitField0_;
- // repeated int32 path = 1 [packed = true];
public static final int PATH_FIELD_NUMBER = 1;
private java.util.List path_;
@@ -25126,5 +26975,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -25141,5 +26989,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -25159,5 +27006,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -25174,5 +27020,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -25191,5 +27036,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -25206,5 +27050,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -25219,5 +27062,4 @@
private int pathMemoizedSerializedSize = -1;
- // repeated int32 span = 2 [packed = true];
public static final int SPAN_FIELD_NUMBER = 2;
private java.util.List span_;
@@ -25267,5 +27109,4 @@
private int spanMemoizedSerializedSize = -1;
- // optional string leading_comments = 3;
public static final int LEADING_COMMENTS_FIELD_NUMBER = 3;
private java.lang.Object leadingComments_;
@@ -25277,28 +27118,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -25320,28 +27154,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -25374,28 +27201,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -25421,5 +27241,4 @@
}
- // optional string trailing_comments = 4;
public static final int TRAILING_COMMENTS_FIELD_NUMBER = 4;
private java.lang.Object trailingComments_;
@@ -25473,5 +27292,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
@@ -25629,6 +27449,7 @@
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder
- implements com.google.protobuf.DescriptorProtos.SourceCodeInfo.LocationOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:google.protobuf.SourceCodeInfo.Location)
+ com.google.protobuf.DescriptorProtos.SourceCodeInfo.LocationOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
@@ -25790,5 +27611,4 @@
private int bitField0_;
- // repeated int32 path = 1 [packed = true];
private java.util.List path_ = java.util.Collections.emptyList();
private void ensurePathIsMutable() {
@@ -25804,5 +27624,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -25819,5 +27638,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -25837,5 +27655,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -25852,5 +27669,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -25869,5 +27685,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -25884,5 +27699,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -25901,5 +27715,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -25916,5 +27729,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -25937,5 +27749,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -25952,5 +27763,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -25972,5 +27782,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -25987,5 +27796,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -25998,5 +27806,6 @@
java.lang.Iterable values) {
ensurePathIsMutable();
- super.addAll(values, path_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, path_);
onChanged();
return this;
@@ -26008,5 +27817,4 @@
* Identifies which part of the FileDescriptorProto was defined at this
* location.
- *
* Each element is a field number or an index. They form a path from
* the root FileDescriptorProto to the place where the definition. For
@@ -26023,5 +27831,4 @@
* and FieldDescriptorProto.name has field number 1:
* optional string name = 1;
- *
* Thus, the above path gives the location of a field name. If we removed
* the last element:
@@ -26038,5 +27845,4 @@
}
- // repeated int32 span = 2 [packed = true];
private java.util.List span_ = java.util.Collections.emptyList();
private void ensureSpanIsMutable() {
@@ -26138,5 +27944,6 @@
java.lang.Iterable values) {
ensureSpanIsMutable();
- super.addAll(values, span_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, span_);
onChanged();
return this;
@@ -26160,5 +27967,4 @@
}
- // optional string leading_comments = 3;
private java.lang.Object leadingComments_ = "";
/**
@@ -26169,28 +27975,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -26212,28 +28011,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -26248,7 +28040,10 @@
java.lang.Object ref = leadingComments_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- leadingComments_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ leadingComments_ = s;
+ }
return s;
} else {
@@ -26263,28 +28058,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -26316,28 +28104,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -26366,28 +28147,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -26412,28 +28186,21 @@
* comments appearing before and after the declaration which appear to be
* attached to the declaration.
- *
* A series of line comments appearing on consecutive lines, with no other
* tokens appearing on those lines, will be treated as a single comment.
- *
* Only the comment content is provided; comment markers (e.g. //) are
* stripped out. For block comments, leading whitespace and an asterisk
* will be stripped from the beginning of each line other than the first.
* Newlines are included in the output.
- *
* Examples:
- *
* optional int32 foo = 1; // Comment attached to foo.
* // Comment attached to bar.
* optional int32 bar = 2;
- *
* optional string baz = 3;
* // Comment attached to baz.
* // Another line attached to baz.
- *
* // Comment attached to qux.
* //
* // Another line attached to qux.
* optional double qux = 4;
- *
* optional string corge = 5;
* /* Block comment attached
@@ -26456,5 +28223,4 @@
}
- // optional string trailing_comments = 4;
private java.lang.Object trailingComments_ = "";
/**
@@ -26470,7 +28236,10 @@
java.lang.Object ref = trailingComments_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- trailingComments_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ trailingComments_ = s;
+ }
return s;
} else {
@@ -26541,5 +28310,4 @@
}
- // repeated .google.protobuf.SourceCodeInfo.Location location = 1;
public static final int LOCATION_FIELD_NUMBER = 1;
private java.util.List location_;
@@ -26552,5 +28320,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -26568,5 +28335,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -26604,5 +28370,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -26620,5 +28385,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -26657,5 +28421,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -26673,5 +28436,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -26709,5 +28471,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -26725,5 +28486,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -26761,5 +28521,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -26777,5 +28536,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -26813,5 +28571,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
@@ -26925,6 +28684,7 @@
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder
- implements com.google.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:google.protobuf.SourceCodeInfo)
+ com.google.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
@@ -27070,5 +28830,4 @@
private int bitField0_;
- // repeated .google.protobuf.SourceCodeInfo.Location location = 1;
private java.util.List location_ =
java.util.Collections.emptyList();
@@ -27091,5 +28850,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27107,5 +28865,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27147,5 +28904,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27163,5 +28919,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27203,5 +28958,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27219,5 +28973,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27259,5 +29012,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27275,5 +29027,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27322,5 +29073,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27338,5 +29088,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27382,5 +29131,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27398,5 +29146,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27444,5 +29191,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27460,5 +29206,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27507,5 +29252,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27523,5 +29267,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27567,5 +29310,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27583,5 +29325,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27627,5 +29368,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27643,5 +29383,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27672,5 +29411,6 @@
if (locationBuilder_ == null) {
ensureLocationIsMutable();
- super.addAll(values, location_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, location_);
onChanged();
} else {
@@ -27687,5 +29427,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27703,5 +29442,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27746,5 +29484,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27762,5 +29499,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27805,5 +29541,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27821,5 +29556,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27858,5 +29592,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27874,5 +29607,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27914,5 +29646,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27930,5 +29661,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -27971,5 +29701,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -27987,5 +29716,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -28024,5 +29752,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -28040,5 +29767,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -28078,5 +29804,4 @@
* to be useful to IDEs, code indexers, documentation generators, and similar
* tools.
- *
* For example, say we have a file like:
* message Foo {
@@ -28094,5 +29819,4 @@
* [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
* [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
- *
* Notes:
* - A location may refer to a repeated field itself (i.e. not to any
@@ -28149,100 +29873,105 @@
}
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_FileDescriptorSet_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_FileDescriptorSet_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_FileDescriptorProto_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_FileDescriptorProto_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_DescriptorProto_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_DescriptorProto_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_DescriptorProto_ExtensionRange_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_FieldDescriptorProto_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_FieldDescriptorProto_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_google_protobuf_OneofDescriptorProto_descriptor;
+ private static
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internal_static_google_protobuf_OneofDescriptorProto_fieldAccessorTable;
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_EnumDescriptorProto_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_EnumDescriptorProto_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_EnumValueDescriptorProto_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_EnumValueDescriptorProto_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_ServiceDescriptorProto_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_ServiceDescriptorProto_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_MethodDescriptorProto_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_MethodDescriptorProto_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_FileOptions_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_FileOptions_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_MessageOptions_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_MessageOptions_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_FieldOptions_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_FieldOptions_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_EnumOptions_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_EnumOptions_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_EnumValueOptions_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_EnumValueOptions_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_ServiceOptions_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_ServiceOptions_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_MethodOptions_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_MethodOptions_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_UninterpretedOption_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_UninterpretedOption_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_UninterpretedOption_NamePart_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_UninterpretedOption_NamePart_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_SourceCodeInfo_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_google_protobuf_SourceCodeInfo_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_SourceCodeInfo_Location_descriptor;
private static
@@ -28258,241 +29987,254 @@
static {
java.lang.String[] descriptorData = {
- "\n\031protobuf/descriptor.proto\022\017google.prot" +
- "obuf\"G\n\021FileDescriptorSet\0222\n\004file\030\001 \003(\0132" +
- "$.google.protobuf.FileDescriptorProto\"\313\003" +
- "\n\023FileDescriptorProto\022\014\n\004name\030\001 \001(\t\022\017\n\007p" +
- "ackage\030\002 \001(\t\022\022\n\ndependency\030\003 \003(\t\022\031\n\021publ" +
- "ic_dependency\030\n \003(\005\022\027\n\017weak_dependency\030\013" +
- " \003(\005\0226\n\014message_type\030\004 \003(\0132 .google.prot" +
- "obuf.DescriptorProto\0227\n\tenum_type\030\005 \003(\0132" +
- "$.google.protobuf.EnumDescriptorProto\0228\n" +
- "\007service\030\006 \003(\0132\'.google.protobuf.Service",
- "DescriptorProto\0228\n\textension\030\007 \003(\0132%.goo" +
- "gle.protobuf.FieldDescriptorProto\022-\n\007opt" +
- "ions\030\010 \001(\0132\034.google.protobuf.FileOptions" +
- "\0229\n\020source_code_info\030\t \001(\0132\037.google.prot" +
- "obuf.SourceCodeInfo\"\251\003\n\017DescriptorProto\022" +
- "\014\n\004name\030\001 \001(\t\0224\n\005field\030\002 \003(\0132%.google.pr" +
- "otobuf.FieldDescriptorProto\0228\n\textension" +
- "\030\006 \003(\0132%.google.protobuf.FieldDescriptor" +
- "Proto\0225\n\013nested_type\030\003 \003(\0132 .google.prot" +
- "obuf.DescriptorProto\0227\n\tenum_type\030\004 \003(\0132",
- "$.google.protobuf.EnumDescriptorProto\022H\n" +
- "\017extension_range\030\005 \003(\0132/.google.protobuf" +
- ".DescriptorProto.ExtensionRange\0220\n\007optio" +
- "ns\030\007 \001(\0132\037.google.protobuf.MessageOption" +
- "s\032,\n\016ExtensionRange\022\r\n\005start\030\001 \001(\005\022\013\n\003en" +
- "d\030\002 \001(\005\"\224\005\n\024FieldDescriptorProto\022\014\n\004name" +
- "\030\001 \001(\t\022\016\n\006number\030\003 \001(\005\022:\n\005label\030\004 \001(\0162+." +
- "google.protobuf.FieldDescriptorProto.Lab" +
- "el\0228\n\004type\030\005 \001(\0162*.google.protobuf.Field" +
- "DescriptorProto.Type\022\021\n\ttype_name\030\006 \001(\t\022",
- "\020\n\010extendee\030\002 \001(\t\022\025\n\rdefault_value\030\007 \001(\t" +
- "\022.\n\007options\030\010 \001(\0132\035.google.protobuf.Fiel" +
- "dOptions\"\266\002\n\004Type\022\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTY" +
- "PE_FLOAT\020\002\022\016\n\nTYPE_INT64\020\003\022\017\n\013TYPE_UINT6" +
- "4\020\004\022\016\n\nTYPE_INT32\020\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n" +
- "\014TYPE_FIXED32\020\007\022\r\n\tTYPE_BOOL\020\010\022\017\n\013TYPE_S" +
- "TRING\020\t\022\016\n\nTYPE_GROUP\020\n\022\020\n\014TYPE_MESSAGE\020" +
- "\013\022\016\n\nTYPE_BYTES\020\014\022\017\n\013TYPE_UINT32\020\r\022\r\n\tTY" +
- "PE_ENUM\020\016\022\021\n\rTYPE_SFIXED32\020\017\022\021\n\rTYPE_SFI" +
- "XED64\020\020\022\017\n\013TYPE_SINT32\020\021\022\017\n\013TYPE_SINT64\020",
- "\022\"C\n\005Label\022\022\n\016LABEL_OPTIONAL\020\001\022\022\n\016LABEL_" +
- "REQUIRED\020\002\022\022\n\016LABEL_REPEATED\020\003\"\214\001\n\023EnumD" +
- "escriptorProto\022\014\n\004name\030\001 \001(\t\0228\n\005value\030\002 " +
- "\003(\0132).google.protobuf.EnumValueDescripto" +
- "rProto\022-\n\007options\030\003 \001(\0132\034.google.protobu" +
- "f.EnumOptions\"l\n\030EnumValueDescriptorProt" +
- "o\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\002 \001(\005\0222\n\007optio" +
- "ns\030\003 \001(\0132!.google.protobuf.EnumValueOpti" +
- "ons\"\220\001\n\026ServiceDescriptorProto\022\014\n\004name\030\001" +
- " \001(\t\0226\n\006method\030\002 \003(\0132&.google.protobuf.M",
- "ethodDescriptorProto\0220\n\007options\030\003 \001(\0132\037." +
- "google.protobuf.ServiceOptions\"\177\n\025Method" +
- "DescriptorProto\022\014\n\004name\030\001 \001(\t\022\022\n\ninput_t" +
- "ype\030\002 \001(\t\022\023\n\013output_type\030\003 \001(\t\022/\n\007option" +
- "s\030\004 \001(\0132\036.google.protobuf.MethodOptions\"" +
- "\351\003\n\013FileOptions\022\024\n\014java_package\030\001 \001(\t\022\034\n" +
- "\024java_outer_classname\030\010 \001(\t\022\"\n\023java_mult" +
- "iple_files\030\n \001(\010:\005false\022,\n\035java_generate" +
- "_equals_and_hash\030\024 \001(\010:\005false\022F\n\014optimiz" +
- "e_for\030\t \001(\0162).google.protobuf.FileOption",
- "s.OptimizeMode:\005SPEED\022\022\n\ngo_package\030\013 \001(" +
- "\t\022\"\n\023cc_generic_services\030\020 \001(\010:\005false\022$\n" +
- "\025java_generic_services\030\021 \001(\010:\005false\022\"\n\023p" +
- "y_generic_services\030\022 \001(\010:\005false\022C\n\024unint" +
- "erpreted_option\030\347\007 \003(\0132$.google.protobuf" +
- ".UninterpretedOption\":\n\014OptimizeMode\022\t\n\005" +
- "SPEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003" +
- "*\t\010\350\007\020\200\200\200\200\002\"\270\001\n\016MessageOptions\022&\n\027messag" +
- "e_set_wire_format\030\001 \001(\010:\005false\022.\n\037no_sta" +
- "ndard_descriptor_accessor\030\002 \001(\010:\005false\022C",
- "\n\024uninterpreted_option\030\347\007 \003(\0132$.google.p" +
- "rotobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\276" +
- "\002\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.google." +
- "protobuf.FieldOptions.CType:\006STRING\022\016\n\006p" +
- "acked\030\002 \001(\010\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\ndepr" +
- "ecated\030\003 \001(\010:\005false\022\034\n\024experimental_map_" +
- "key\030\t \001(\t\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024uninte" +
- "rpreted_option\030\347\007 \003(\0132$.google.protobuf." +
- "UninterpretedOption\"/\n\005CType\022\n\n\006STRING\020\000" +
- "\022\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002*\t\010\350\007\020\200\200\200\200\002\"",
- "x\n\013EnumOptions\022\031\n\013allow_alias\030\002 \001(\010:\004tru" +
+ "\n\020descriptor.proto\022\017google.protobuf\"G\n\021F" +
+ "ileDescriptorSet\0222\n\004file\030\001 \003(\0132$.google." +
+ "protobuf.FileDescriptorProto\"\313\003\n\023FileDes" +
+ "criptorProto\022\014\n\004name\030\001 \001(\t\022\017\n\007package\030\002 " +
+ "\001(\t\022\022\n\ndependency\030\003 \003(\t\022\031\n\021public_depend" +
+ "ency\030\n \003(\005\022\027\n\017weak_dependency\030\013 \003(\005\0226\n\014m" +
+ "essage_type\030\004 \003(\0132 .google.protobuf.Desc" +
+ "riptorProto\0227\n\tenum_type\030\005 \003(\0132$.google." +
+ "protobuf.EnumDescriptorProto\0228\n\007service\030" +
+ "\006 \003(\0132\'.google.protobuf.ServiceDescripto",
+ "rProto\0228\n\textension\030\007 \003(\0132%.google.proto" +
+ "buf.FieldDescriptorProto\022-\n\007options\030\010 \001(" +
+ "\0132\034.google.protobuf.FileOptions\0229\n\020sourc" +
+ "e_code_info\030\t \001(\0132\037.google.protobuf.Sour" +
+ "ceCodeInfo\"\344\003\n\017DescriptorProto\022\014\n\004name\030\001" +
+ " \001(\t\0224\n\005field\030\002 \003(\0132%.google.protobuf.Fi" +
+ "eldDescriptorProto\0228\n\textension\030\006 \003(\0132%." +
+ "google.protobuf.FieldDescriptorProto\0225\n\013" +
+ "nested_type\030\003 \003(\0132 .google.protobuf.Desc" +
+ "riptorProto\0227\n\tenum_type\030\004 \003(\0132$.google.",
+ "protobuf.EnumDescriptorProto\022H\n\017extensio" +
+ "n_range\030\005 \003(\0132/.google.protobuf.Descript" +
+ "orProto.ExtensionRange\0229\n\noneof_decl\030\010 \003" +
+ "(\0132%.google.protobuf.OneofDescriptorProt" +
+ "o\0220\n\007options\030\007 \001(\0132\037.google.protobuf.Mes" +
+ "sageOptions\032,\n\016ExtensionRange\022\r\n\005start\030\001" +
+ " \001(\005\022\013\n\003end\030\002 \001(\005\"\251\005\n\024FieldDescriptorPro" +
+ "to\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\003 \001(\005\022:\n\005labe" +
+ "l\030\004 \001(\0162+.google.protobuf.FieldDescripto" +
+ "rProto.Label\0228\n\004type\030\005 \001(\0162*.google.prot",
+ "obuf.FieldDescriptorProto.Type\022\021\n\ttype_n" +
+ "ame\030\006 \001(\t\022\020\n\010extendee\030\002 \001(\t\022\025\n\rdefault_v" +
+ "alue\030\007 \001(\t\022\023\n\013oneof_index\030\t \001(\005\022.\n\007optio" +
+ "ns\030\010 \001(\0132\035.google.protobuf.FieldOptions\"" +
+ "\266\002\n\004Type\022\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020" +
+ "\002\022\016\n\nTYPE_INT64\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTY" +
+ "PE_INT32\020\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n\014TYPE_FIX" +
+ "ED32\020\007\022\r\n\tTYPE_BOOL\020\010\022\017\n\013TYPE_STRING\020\t\022\016" +
+ "\n\nTYPE_GROUP\020\n\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\nTYPE" +
+ "_BYTES\020\014\022\017\n\013TYPE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016",
+ "\022\021\n\rTYPE_SFIXED32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017" +
+ "\n\013TYPE_SINT32\020\021\022\017\n\013TYPE_SINT64\020\022\"C\n\005Labe" +
+ "l\022\022\n\016LABEL_OPTIONAL\020\001\022\022\n\016LABEL_REQUIRED\020" +
+ "\002\022\022\n\016LABEL_REPEATED\020\003\"$\n\024OneofDescriptor" +
+ "Proto\022\014\n\004name\030\001 \001(\t\"\214\001\n\023EnumDescriptorPr" +
+ "oto\022\014\n\004name\030\001 \001(\t\0228\n\005value\030\002 \003(\0132).googl" +
+ "e.protobuf.EnumValueDescriptorProto\022-\n\007o" +
+ "ptions\030\003 \001(\0132\034.google.protobuf.EnumOptio" +
+ "ns\"l\n\030EnumValueDescriptorProto\022\014\n\004name\030\001" +
+ " \001(\t\022\016\n\006number\030\002 \001(\005\0222\n\007options\030\003 \001(\0132!.",
+ "google.protobuf.EnumValueOptions\"\220\001\n\026Ser" +
+ "viceDescriptorProto\022\014\n\004name\030\001 \001(\t\0226\n\006met" +
+ "hod\030\002 \003(\0132&.google.protobuf.MethodDescri" +
+ "ptorProto\0220\n\007options\030\003 \001(\0132\037.google.prot" +
+ "obuf.ServiceOptions\"\177\n\025MethodDescriptorP" +
+ "roto\022\014\n\004name\030\001 \001(\t\022\022\n\ninput_type\030\002 \001(\t\022\023" +
+ "\n\013output_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.g" +
+ "oogle.protobuf.MethodOptions\"\253\004\n\013FileOpt" +
+ "ions\022\024\n\014java_package\030\001 \001(\t\022\034\n\024java_outer" +
+ "_classname\030\010 \001(\t\022\"\n\023java_multiple_files\030",
+ "\n \001(\010:\005false\022,\n\035java_generate_equals_and" +
+ "_hash\030\024 \001(\010:\005false\022%\n\026java_string_check_" +
+ "utf8\030\033 \001(\010:\005false\022F\n\014optimize_for\030\t \001(\0162" +
+ ").google.protobuf.FileOptions.OptimizeMo" +
+ "de:\005SPEED\022\022\n\ngo_package\030\013 \001(\t\022\"\n\023cc_gene" +
+ "ric_services\030\020 \001(\010:\005false\022$\n\025java_generi" +
+ "c_services\030\021 \001(\010:\005false\022\"\n\023py_generic_se" +
+ "rvices\030\022 \001(\010:\005false\022\031\n\ndeprecated\030\027 \001(\010:" +
+ "\005false\022C\n\024uninterpreted_option\030\347\007 \003(\0132$." +
+ "google.protobuf.UninterpretedOption\":\n\014O",
+ "ptimizeMode\022\t\n\005SPEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n" +
+ "\014LITE_RUNTIME\020\003*\t\010\350\007\020\200\200\200\200\002\"\323\001\n\016MessageOp" +
+ "tions\022&\n\027message_set_wire_format\030\001 \001(\010:\005" +
+ "false\022.\n\037no_standard_descriptor_accessor" +
+ "\030\002 \001(\010:\005false\022\031\n\ndeprecated\030\003 \001(\010:\005false" +
+ "\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.google" +
+ ".protobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002" +
+ "\"\276\002\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.googl" +
+ "e.protobuf.FieldOptions.CType:\006STRING\022\016\n" +
+ "\006packed\030\002 \001(\010\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\nde",
+ "precated\030\003 \001(\010:\005false\022\034\n\024experimental_ma" +
+ "p_key\030\t \001(\t\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024unin" +
+ "terpreted_option\030\347\007 \003(\0132$.google.protobu" +
+ "f.UninterpretedOption\"/\n\005CType\022\n\n\006STRING" +
+ "\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002*\t\010\350\007\020\200\200\200\200" +
+ "\002\"\215\001\n\013EnumOptions\022\023\n\013allow_alias\030\002 \001(\010\022\031" +
+ "\n\ndeprecated\030\003 \001(\010:\005false\022C\n\024uninterpret" +
+ "ed_option\030\347\007 \003(\0132$.google.protobuf.Unint" +
+ "erpretedOption*\t\010\350\007\020\200\200\200\200\002\"}\n\020EnumValueOp" +
+ "tions\022\031\n\ndeprecated\030\001 \001(\010:\005false\022C\n\024unin",
+ "terpreted_option\030\347\007 \003(\0132$.google.protobu" +
+ "f.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"{\n\016Serv" +
+ "iceOptions\022\031\n\ndeprecated\030! \001(\010:\005false\022C\n" +
+ "\024uninterpreted_option\030\347\007 \003(\0132$.google.pr" +
+ "otobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"z\n" +
+ "\rMethodOptions\022\031\n\ndeprecated\030! \001(\010:\005fals" +
"e\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.googl" +
"e.protobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200" +
- "\002\"b\n\020EnumValueOptions\022C\n\024uninterpreted_o" +
- "ption\030\347\007 \003(\0132$.google.protobuf.Uninterpr" +
- "etedOption*\t\010\350\007\020\200\200\200\200\002\"`\n\016ServiceOptions\022" +
- "C\n\024uninterpreted_option\030\347\007 \003(\0132$.google." +
- "protobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"" +
- "_\n\rMethodOptions\022C\n\024uninterpreted_option" +
- "\030\347\007 \003(\0132$.google.protobuf.UninterpretedO",
- "ption*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOption" +
- "\022;\n\004name\030\002 \003(\0132-.google.protobuf.Uninter" +
- "pretedOption.NamePart\022\030\n\020identifier_valu" +
- "e\030\003 \001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022\032\n\022n" +
- "egative_int_value\030\005 \001(\003\022\024\n\014double_value\030" +
- "\006 \001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggregate" +
- "_value\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_part\030\001 " +
- "\002(\t\022\024\n\014is_extension\030\002 \002(\010\"\261\001\n\016SourceCode" +
- "Info\022:\n\010location\030\001 \003(\0132(.google.protobuf" +
- ".SourceCodeInfo.Location\032c\n\010Location\022\020\n\004",
- "path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020lead" +
- "ing_comments\030\003 \001(\t\022\031\n\021trailing_comments\030" +
- "\004 \001(\tB)\n\023com.google.protobufB\020Descriptor" +
- "ProtosH\001"
+ "\002\"\236\002\n\023UninterpretedOption\022;\n\004name\030\002 \003(\0132" +
+ "-.google.protobuf.UninterpretedOption.Na",
+ "mePart\022\030\n\020identifier_value\030\003 \001(\t\022\032\n\022posi" +
+ "tive_int_value\030\004 \001(\004\022\032\n\022negative_int_val" +
+ "ue\030\005 \001(\003\022\024\n\014double_value\030\006 \001(\001\022\024\n\014string" +
+ "_value\030\007 \001(\014\022\027\n\017aggregate_value\030\010 \001(\t\0323\n" +
+ "\010NamePart\022\021\n\tname_part\030\001 \002(\t\022\024\n\014is_exten" +
+ "sion\030\002 \002(\010\"\261\001\n\016SourceCodeInfo\022:\n\010locatio" +
+ "n\030\001 \003(\0132(.google.protobuf.SourceCodeInfo" +
+ ".Location\032c\n\010Location\022\020\n\004path\030\001 \003(\005B\002\020\001\022" +
+ "\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020leading_comments\030\003 " +
+ "\001(\t\022\031\n\021trailing_comments\030\004 \001(\tB)\n\023com.go",
+ "ogle.protobufB\020DescriptorProtosH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_google_protobuf_FileDescriptorSet_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_google_protobuf_FileDescriptorSet_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_FileDescriptorSet_descriptor,
- new java.lang.String[] { "File", });
- internal_static_google_protobuf_FileDescriptorProto_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_google_protobuf_FileDescriptorProto_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_FileDescriptorProto_descriptor,
- new java.lang.String[] { "Name", "Package", "Dependency", "PublicDependency", "WeakDependency", "MessageType", "EnumType", "Service", "Extension", "Options", "SourceCodeInfo", });
- internal_static_google_protobuf_DescriptorProto_descriptor =
- getDescriptor().getMessageTypes().get(2);
- internal_static_google_protobuf_DescriptorProto_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_DescriptorProto_descriptor,
- new java.lang.String[] { "Name", "Field", "Extension", "NestedType", "EnumType", "ExtensionRange", "Options", });
- internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor =
- internal_static_google_protobuf_DescriptorProto_descriptor.getNestedTypes().get(0);
- internal_static_google_protobuf_DescriptorProto_ExtensionRange_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor,
- new java.lang.String[] { "Start", "End", });
- internal_static_google_protobuf_FieldDescriptorProto_descriptor =
- getDescriptor().getMessageTypes().get(3);
- internal_static_google_protobuf_FieldDescriptorProto_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_FieldDescriptorProto_descriptor,
- new java.lang.String[] { "Name", "Number", "Label", "Type", "TypeName", "Extendee", "DefaultValue", "Options", });
- internal_static_google_protobuf_EnumDescriptorProto_descriptor =
- getDescriptor().getMessageTypes().get(4);
- internal_static_google_protobuf_EnumDescriptorProto_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_EnumDescriptorProto_descriptor,
- new java.lang.String[] { "Name", "Value", "Options", });
- internal_static_google_protobuf_EnumValueDescriptorProto_descriptor =
- getDescriptor().getMessageTypes().get(5);
- internal_static_google_protobuf_EnumValueDescriptorProto_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_EnumValueDescriptorProto_descriptor,
- new java.lang.String[] { "Name", "Number", "Options", });
- internal_static_google_protobuf_ServiceDescriptorProto_descriptor =
- getDescriptor().getMessageTypes().get(6);
- internal_static_google_protobuf_ServiceDescriptorProto_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_ServiceDescriptorProto_descriptor,
- new java.lang.String[] { "Name", "Method", "Options", });
- internal_static_google_protobuf_MethodDescriptorProto_descriptor =
- getDescriptor().getMessageTypes().get(7);
- internal_static_google_protobuf_MethodDescriptorProto_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_MethodDescriptorProto_descriptor,
- new java.lang.String[] { "Name", "InputType", "OutputType", "Options", });
- internal_static_google_protobuf_FileOptions_descriptor =
- getDescriptor().getMessageTypes().get(8);
- internal_static_google_protobuf_FileOptions_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_FileOptions_descriptor,
- new java.lang.String[] { "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "JavaGenerateEqualsAndHash", "OptimizeFor", "GoPackage", "CcGenericServices", "JavaGenericServices", "PyGenericServices", "UninterpretedOption", });
- internal_static_google_protobuf_MessageOptions_descriptor =
- getDescriptor().getMessageTypes().get(9);
- internal_static_google_protobuf_MessageOptions_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_MessageOptions_descriptor,
- new java.lang.String[] { "MessageSetWireFormat", "NoStandardDescriptorAccessor", "UninterpretedOption", });
- internal_static_google_protobuf_FieldOptions_descriptor =
- getDescriptor().getMessageTypes().get(10);
- internal_static_google_protobuf_FieldOptions_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_FieldOptions_descriptor,
- new java.lang.String[] { "Ctype", "Packed", "Lazy", "Deprecated", "ExperimentalMapKey", "Weak", "UninterpretedOption", });
- internal_static_google_protobuf_EnumOptions_descriptor =
- getDescriptor().getMessageTypes().get(11);
- internal_static_google_protobuf_EnumOptions_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_EnumOptions_descriptor,
- new java.lang.String[] { "AllowAlias", "UninterpretedOption", });
- internal_static_google_protobuf_EnumValueOptions_descriptor =
- getDescriptor().getMessageTypes().get(12);
- internal_static_google_protobuf_EnumValueOptions_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_EnumValueOptions_descriptor,
- new java.lang.String[] { "UninterpretedOption", });
- internal_static_google_protobuf_ServiceOptions_descriptor =
- getDescriptor().getMessageTypes().get(13);
- internal_static_google_protobuf_ServiceOptions_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_ServiceOptions_descriptor,
- new java.lang.String[] { "UninterpretedOption", });
- internal_static_google_protobuf_MethodOptions_descriptor =
- getDescriptor().getMessageTypes().get(14);
- internal_static_google_protobuf_MethodOptions_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_MethodOptions_descriptor,
- new java.lang.String[] { "UninterpretedOption", });
- internal_static_google_protobuf_UninterpretedOption_descriptor =
- getDescriptor().getMessageTypes().get(15);
- internal_static_google_protobuf_UninterpretedOption_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_UninterpretedOption_descriptor,
- new java.lang.String[] { "Name", "IdentifierValue", "PositiveIntValue", "NegativeIntValue", "DoubleValue", "StringValue", "AggregateValue", });
- internal_static_google_protobuf_UninterpretedOption_NamePart_descriptor =
- internal_static_google_protobuf_UninterpretedOption_descriptor.getNestedTypes().get(0);
- internal_static_google_protobuf_UninterpretedOption_NamePart_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_UninterpretedOption_NamePart_descriptor,
- new java.lang.String[] { "NamePart", "IsExtension", });
- internal_static_google_protobuf_SourceCodeInfo_descriptor =
- getDescriptor().getMessageTypes().get(16);
- internal_static_google_protobuf_SourceCodeInfo_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_SourceCodeInfo_descriptor,
- new java.lang.String[] { "Location", });
- internal_static_google_protobuf_SourceCodeInfo_Location_descriptor =
- internal_static_google_protobuf_SourceCodeInfo_descriptor.getNestedTypes().get(0);
- internal_static_google_protobuf_SourceCodeInfo_Location_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_google_protobuf_SourceCodeInfo_Location_descriptor,
- new java.lang.String[] { "Path", "Span", "LeadingComments", "TrailingComments", });
- return null;
- }
- };
+ new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public com.google.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
}, assigner);
+ internal_static_google_protobuf_FileDescriptorSet_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_google_protobuf_FileDescriptorSet_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_FileDescriptorSet_descriptor,
+ new java.lang.String[] { "File", });
+ internal_static_google_protobuf_FileDescriptorProto_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_google_protobuf_FileDescriptorProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_FileDescriptorProto_descriptor,
+ new java.lang.String[] { "Name", "Package", "Dependency", "PublicDependency", "WeakDependency", "MessageType", "EnumType", "Service", "Extension", "Options", "SourceCodeInfo", });
+ internal_static_google_protobuf_DescriptorProto_descriptor =
+ getDescriptor().getMessageTypes().get(2);
+ internal_static_google_protobuf_DescriptorProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_DescriptorProto_descriptor,
+ new java.lang.String[] { "Name", "Field", "Extension", "NestedType", "EnumType", "ExtensionRange", "OneofDecl", "Options", });
+ internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor =
+ internal_static_google_protobuf_DescriptorProto_descriptor.getNestedTypes().get(0);
+ internal_static_google_protobuf_DescriptorProto_ExtensionRange_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor,
+ new java.lang.String[] { "Start", "End", });
+ internal_static_google_protobuf_FieldDescriptorProto_descriptor =
+ getDescriptor().getMessageTypes().get(3);
+ internal_static_google_protobuf_FieldDescriptorProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_FieldDescriptorProto_descriptor,
+ new java.lang.String[] { "Name", "Number", "Label", "Type", "TypeName", "Extendee", "DefaultValue", "OneofIndex", "Options", });
+ internal_static_google_protobuf_OneofDescriptorProto_descriptor =
+ getDescriptor().getMessageTypes().get(4);
+ internal_static_google_protobuf_OneofDescriptorProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_OneofDescriptorProto_descriptor,
+ new java.lang.String[] { "Name", });
+ internal_static_google_protobuf_EnumDescriptorProto_descriptor =
+ getDescriptor().getMessageTypes().get(5);
+ internal_static_google_protobuf_EnumDescriptorProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_EnumDescriptorProto_descriptor,
+ new java.lang.String[] { "Name", "Value", "Options", });
+ internal_static_google_protobuf_EnumValueDescriptorProto_descriptor =
+ getDescriptor().getMessageTypes().get(6);
+ internal_static_google_protobuf_EnumValueDescriptorProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_EnumValueDescriptorProto_descriptor,
+ new java.lang.String[] { "Name", "Number", "Options", });
+ internal_static_google_protobuf_ServiceDescriptorProto_descriptor =
+ getDescriptor().getMessageTypes().get(7);
+ internal_static_google_protobuf_ServiceDescriptorProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_ServiceDescriptorProto_descriptor,
+ new java.lang.String[] { "Name", "Method", "Options", });
+ internal_static_google_protobuf_MethodDescriptorProto_descriptor =
+ getDescriptor().getMessageTypes().get(8);
+ internal_static_google_protobuf_MethodDescriptorProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_MethodDescriptorProto_descriptor,
+ new java.lang.String[] { "Name", "InputType", "OutputType", "Options", });
+ internal_static_google_protobuf_FileOptions_descriptor =
+ getDescriptor().getMessageTypes().get(9);
+ internal_static_google_protobuf_FileOptions_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_FileOptions_descriptor,
+ new java.lang.String[] { "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "JavaGenerateEqualsAndHash", "JavaStringCheckUtf8", "OptimizeFor", "GoPackage", "CcGenericServices", "JavaGenericServices", "PyGenericServices", "Deprecated", "UninterpretedOption", });
+ internal_static_google_protobuf_MessageOptions_descriptor =
+ getDescriptor().getMessageTypes().get(10);
+ internal_static_google_protobuf_MessageOptions_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_MessageOptions_descriptor,
+ new java.lang.String[] { "MessageSetWireFormat", "NoStandardDescriptorAccessor", "Deprecated", "UninterpretedOption", });
+ internal_static_google_protobuf_FieldOptions_descriptor =
+ getDescriptor().getMessageTypes().get(11);
+ internal_static_google_protobuf_FieldOptions_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_FieldOptions_descriptor,
+ new java.lang.String[] { "Ctype", "Packed", "Lazy", "Deprecated", "ExperimentalMapKey", "Weak", "UninterpretedOption", });
+ internal_static_google_protobuf_EnumOptions_descriptor =
+ getDescriptor().getMessageTypes().get(12);
+ internal_static_google_protobuf_EnumOptions_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_EnumOptions_descriptor,
+ new java.lang.String[] { "AllowAlias", "Deprecated", "UninterpretedOption", });
+ internal_static_google_protobuf_EnumValueOptions_descriptor =
+ getDescriptor().getMessageTypes().get(13);
+ internal_static_google_protobuf_EnumValueOptions_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_EnumValueOptions_descriptor,
+ new java.lang.String[] { "Deprecated", "UninterpretedOption", });
+ internal_static_google_protobuf_ServiceOptions_descriptor =
+ getDescriptor().getMessageTypes().get(14);
+ internal_static_google_protobuf_ServiceOptions_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_ServiceOptions_descriptor,
+ new java.lang.String[] { "Deprecated", "UninterpretedOption", });
+ internal_static_google_protobuf_MethodOptions_descriptor =
+ getDescriptor().getMessageTypes().get(15);
+ internal_static_google_protobuf_MethodOptions_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_MethodOptions_descriptor,
+ new java.lang.String[] { "Deprecated", "UninterpretedOption", });
+ internal_static_google_protobuf_UninterpretedOption_descriptor =
+ getDescriptor().getMessageTypes().get(16);
+ internal_static_google_protobuf_UninterpretedOption_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_UninterpretedOption_descriptor,
+ new java.lang.String[] { "Name", "IdentifierValue", "PositiveIntValue", "NegativeIntValue", "DoubleValue", "StringValue", "AggregateValue", });
+ internal_static_google_protobuf_UninterpretedOption_NamePart_descriptor =
+ internal_static_google_protobuf_UninterpretedOption_descriptor.getNestedTypes().get(0);
+ internal_static_google_protobuf_UninterpretedOption_NamePart_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_UninterpretedOption_NamePart_descriptor,
+ new java.lang.String[] { "NamePart", "IsExtension", });
+ internal_static_google_protobuf_SourceCodeInfo_descriptor =
+ getDescriptor().getMessageTypes().get(17);
+ internal_static_google_protobuf_SourceCodeInfo_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_SourceCodeInfo_descriptor,
+ new java.lang.String[] { "Location", });
+ internal_static_google_protobuf_SourceCodeInfo_Location_descriptor =
+ internal_static_google_protobuf_SourceCodeInfo_descriptor.getNestedTypes().get(0);
+ internal_static_google_protobuf_SourceCodeInfo_Location_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_google_protobuf_SourceCodeInfo_Location_descriptor,
+ new java.lang.String[] { "Path", "Span", "LeadingComments", "TrailingComments", });
}
Index: /applications/editors/josm/plugins/pbf/gen/crosby/binary/Fileformat.java
===================================================================
--- /applications/editors/josm/plugins/pbf/gen/crosby/binary/Fileformat.java (revision 30657)
+++ /applications/editors/josm/plugins/pbf/gen/crosby/binary/Fileformat.java (revision 30658)
@@ -1,4 +1,4 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
-// source: src/crosby/binary/fileformat.proto
+// source: fileformat.proto
package crosby.binary;
@@ -9,8 +9,8 @@
com.google.protobuf.ExtensionRegistryLite registry) {
}
- public interface BlobOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // optional bytes raw = 1;
+ public interface BlobOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.Blob)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* optional bytes raw = 1;
@@ -30,5 +30,4 @@
com.google.protobuf.ByteString getRaw();
- // optional int32 raw_size = 2;
/**
* optional int32 raw_size = 2;
@@ -48,5 +47,4 @@
int getRawSize();
- // optional bytes zlib_data = 3;
/**
* optional bytes zlib_data = 3;
@@ -66,5 +64,4 @@
com.google.protobuf.ByteString getZlibData();
- // optional bytes lzma_data = 4;
/**
* optional bytes lzma_data = 4;
@@ -84,5 +81,4 @@
com.google.protobuf.ByteString getLzmaData();
- // optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];
/**
* optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];
@@ -106,12 +102,13 @@
*/
public static final class Blob extends
- com.google.protobuf.GeneratedMessageLite
- implements BlobOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.Blob)
+ BlobOrBuilder {
// Use Blob.newBuilder() to construct.
private Blob(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private Blob(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private Blob(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final Blob defaultInstance;
@@ -124,4 +121,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private Blob(
com.google.protobuf.CodedInputStream input,
@@ -130,4 +128,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -139,5 +142,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -178,4 +181,11 @@
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -197,5 +207,4 @@
private int bitField0_;
- // optional bytes raw = 1;
public static final int RAW_FIELD_NUMBER = 1;
private com.google.protobuf.ByteString raw_;
@@ -221,5 +230,4 @@
}
- // optional int32 raw_size = 2;
public static final int RAW_SIZE_FIELD_NUMBER = 2;
private int rawSize_;
@@ -245,5 +253,4 @@
}
- // optional bytes zlib_data = 3;
public static final int ZLIB_DATA_FIELD_NUMBER = 3;
private com.google.protobuf.ByteString zlibData_;
@@ -269,5 +276,4 @@
}
- // optional bytes lzma_data = 4;
public static final int LZMA_DATA_FIELD_NUMBER = 4;
private com.google.protobuf.ByteString lzmaData_;
@@ -293,5 +299,4 @@
}
- // optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];
public static final int OBSOLETE_BZIP2_DATA_FIELD_NUMBER = 5;
private com.google.protobuf.ByteString oBSOLETEBzip2Data_;
@@ -327,5 +332,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
@@ -351,4 +357,5 @@
output.writeBytes(5, oBSOLETEBzip2Data_);
}
+ output.writeRawBytes(unknownFields);
}
@@ -379,4 +386,5 @@
.computeBytesSize(5, oBSOLETEBzip2Data_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -456,5 +464,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Fileformat.Blob, Builder>
- implements crosby.binary.Fileformat.BlobOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.Blob)
+ crosby.binary.Fileformat.BlobOrBuilder {
// Construct using crosby.binary.Fileformat.Blob.newBuilder()
private Builder() {
@@ -544,4 +554,6 @@
setOBSOLETEBzip2Data(other.getOBSOLETEBzip2Data());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -570,5 +582,4 @@
private int bitField0_;
- // optional bytes raw = 1;
private com.google.protobuf.ByteString raw_ = com.google.protobuf.ByteString.EMPTY;
/**
@@ -622,5 +633,4 @@
}
- // optional int32 raw_size = 2;
private int rawSize_ ;
/**
@@ -671,5 +681,4 @@
}
- // optional bytes zlib_data = 3;
private com.google.protobuf.ByteString zlibData_ = com.google.protobuf.ByteString.EMPTY;
/**
@@ -723,5 +732,4 @@
}
- // optional bytes lzma_data = 4;
private com.google.protobuf.ByteString lzmaData_ = com.google.protobuf.ByteString.EMPTY;
/**
@@ -775,5 +783,4 @@
}
- // optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];
private com.google.protobuf.ByteString oBSOLETEBzip2Data_ = com.google.protobuf.ByteString.EMPTY;
/**
@@ -838,8 +845,8 @@
}
- public interface BlobHeaderOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // required string type = 1;
+ public interface BlobHeaderOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.BlobHeader)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* required string type = 1;
@@ -856,5 +863,4 @@
getTypeBytes();
- // optional bytes indexdata = 2;
/**
* optional bytes indexdata = 2;
@@ -866,5 +872,4 @@
com.google.protobuf.ByteString getIndexdata();
- // required int32 datasize = 3;
/**
* required int32 datasize = 3;
@@ -880,12 +885,13 @@
*/
public static final class BlobHeader extends
- com.google.protobuf.GeneratedMessageLite
- implements BlobHeaderOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.BlobHeader)
+ BlobHeaderOrBuilder {
// Use BlobHeader.newBuilder() to construct.
private BlobHeader(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private BlobHeader(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private BlobHeader(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final BlobHeader defaultInstance;
@@ -898,4 +904,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private BlobHeader(
com.google.protobuf.CodedInputStream input,
@@ -904,4 +911,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -913,5 +925,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -920,6 +932,7 @@
}
case 10: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- type_ = input.readBytes();
+ type_ = bs;
break;
}
@@ -942,4 +955,11 @@
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -961,5 +981,4 @@
private int bitField0_;
- // required string type = 1;
public static final int TYPE_FIELD_NUMBER = 1;
private java.lang.Object type_;
@@ -1004,5 +1023,4 @@
}
- // optional bytes indexdata = 2;
public static final int INDEXDATA_FIELD_NUMBER = 2;
private com.google.protobuf.ByteString indexdata_;
@@ -1020,5 +1038,4 @@
}
- // required int32 datasize = 3;
public static final int DATASIZE_FIELD_NUMBER = 3;
private int datasize_;
@@ -1044,5 +1061,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasType()) {
@@ -1070,4 +1088,5 @@
output.writeInt32(3, datasize_);
}
+ output.writeRawBytes(unknownFields);
}
@@ -1090,4 +1109,5 @@
.computeInt32Size(3, datasize_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -1167,5 +1187,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Fileformat.BlobHeader, Builder>
- implements crosby.binary.Fileformat.BlobHeaderOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.BlobHeader)
+ crosby.binary.Fileformat.BlobHeaderOrBuilder {
// Construct using crosby.binary.Fileformat.BlobHeader.newBuilder()
private Builder() {
@@ -1239,4 +1261,6 @@
setDatasize(other.getDatasize());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -1273,5 +1297,4 @@
private int bitField0_;
- // required string type = 1;
private java.lang.Object type_ = "";
/**
@@ -1287,7 +1310,10 @@
java.lang.Object ref = type_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- type_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ type_ = s;
+ }
return s;
} else {
@@ -1347,5 +1373,4 @@
}
- // optional bytes indexdata = 2;
private com.google.protobuf.ByteString indexdata_ = com.google.protobuf.ByteString.EMPTY;
/**
@@ -1383,5 +1408,4 @@
}
- // required int32 datasize = 3;
private int datasize_ ;
/**
Index: /applications/editors/josm/plugins/pbf/gen/crosby/binary/Osmformat.java
===================================================================
--- /applications/editors/josm/plugins/pbf/gen/crosby/binary/Osmformat.java (revision 30657)
+++ /applications/editors/josm/plugins/pbf/gen/crosby/binary/Osmformat.java (revision 30658)
@@ -1,4 +1,4 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
-// source: src/crosby/binary/osmformat.proto
+// source: osmformat.proto
package crosby.binary;
@@ -9,8 +9,8 @@
com.google.protobuf.ExtensionRegistryLite registry) {
}
- public interface HeaderBlockOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // optional .OSMPBF.HeaderBBox bbox = 1;
+ public interface HeaderBlockOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.HeaderBlock)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* optional .OSMPBF.HeaderBBox bbox = 1;
@@ -22,5 +22,4 @@
crosby.binary.Osmformat.HeaderBBox getBbox();
- // repeated string required_features = 4;
/**
* repeated string required_features = 4;
@@ -30,6 +29,6 @@
*
*/
- java.util.List
- getRequiredFeaturesList();
+ com.google.protobuf.ProtocolStringList
+ getRequiredFeaturesList();
/**
* repeated string required_features = 4;
@@ -58,10 +57,9 @@
getRequiredFeaturesBytes(int index);
- // repeated string optional_features = 5;
/**
* repeated string optional_features = 5;
*/
- java.util.List
- getOptionalFeaturesList();
+ com.google.protobuf.ProtocolStringList
+ getOptionalFeaturesList();
/**
* repeated string optional_features = 5;
@@ -78,5 +76,4 @@
getOptionalFeaturesBytes(int index);
- // optional string writingprogram = 16;
/**
* optional string writingprogram = 16;
@@ -93,5 +90,4 @@
getWritingprogramBytes();
- // optional string source = 17;
/**
* optional string source = 17;
@@ -120,5 +116,4 @@
getSourceBytes();
- // optional int64 osmosis_replication_timestamp = 32;
/**
* optional int64 osmosis_replication_timestamp = 32;
@@ -142,5 +137,4 @@
long getOsmosisReplicationTimestamp();
- // optional int64 osmosis_replication_sequence_number = 33;
/**
* optional int64 osmosis_replication_sequence_number = 33;
@@ -160,5 +154,4 @@
long getOsmosisReplicationSequenceNumber();
- // optional string osmosis_replication_base_url = 34;
/**
* optional string osmosis_replication_base_url = 34;
@@ -191,12 +184,13 @@
*/
public static final class HeaderBlock extends
- com.google.protobuf.GeneratedMessageLite
- implements HeaderBlockOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.HeaderBlock)
+ HeaderBlockOrBuilder {
// Use HeaderBlock.newBuilder() to construct.
private HeaderBlock(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private HeaderBlock(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private HeaderBlock(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final HeaderBlock defaultInstance;
@@ -209,4 +203,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private HeaderBlock(
com.google.protobuf.CodedInputStream input,
@@ -215,4 +210,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -224,5 +224,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -244,27 +244,31 @@
}
case 34: {
+ com.google.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
requiredFeatures_ = new com.google.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000002;
}
- requiredFeatures_.add(input.readBytes());
+ requiredFeatures_.add(bs);
break;
}
case 42: {
+ com.google.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
optionalFeatures_ = new com.google.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000004;
}
- optionalFeatures_.add(input.readBytes());
+ optionalFeatures_.add(bs);
break;
}
case 130: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000002;
- writingprogram_ = input.readBytes();
+ writingprogram_ = bs;
break;
}
case 138: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000004;
- source_ = input.readBytes();
+ source_ = bs;
break;
}
@@ -280,6 +284,7 @@
}
case 274: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000020;
- osmosisReplicationBaseUrl_ = input.readBytes();
+ osmosisReplicationBaseUrl_ = bs;
break;
}
@@ -293,8 +298,15 @@
} finally {
if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
- requiredFeatures_ = new com.google.protobuf.UnmodifiableLazyStringList(requiredFeatures_);
+ requiredFeatures_ = requiredFeatures_.getUnmodifiableView();
}
if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
- optionalFeatures_ = new com.google.protobuf.UnmodifiableLazyStringList(optionalFeatures_);
+ optionalFeatures_ = optionalFeatures_.getUnmodifiableView();
+ }
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
}
makeExtensionsImmutable();
@@ -317,5 +329,4 @@
private int bitField0_;
- // optional .OSMPBF.HeaderBBox bbox = 1;
public static final int BBOX_FIELD_NUMBER = 1;
private crosby.binary.Osmformat.HeaderBBox bbox_;
@@ -333,5 +344,4 @@
}
- // repeated string required_features = 4;
public static final int REQUIRED_FEATURES_FIELD_NUMBER = 4;
private com.google.protobuf.LazyStringList requiredFeatures_;
@@ -343,5 +353,5 @@
*
*/
- public java.util.List
+ public com.google.protobuf.ProtocolStringList
getRequiredFeaturesList() {
return requiredFeatures_;
@@ -379,5 +389,4 @@
}
- // repeated string optional_features = 5;
public static final int OPTIONAL_FEATURES_FIELD_NUMBER = 5;
private com.google.protobuf.LazyStringList optionalFeatures_;
@@ -385,5 +394,5 @@
* repeated string optional_features = 5;
*/
- public java.util.List
+ public com.google.protobuf.ProtocolStringList
getOptionalFeaturesList() {
return optionalFeatures_;
@@ -409,5 +418,4 @@
}
- // optional string writingprogram = 16;
public static final int WRITINGPROGRAM_FIELD_NUMBER = 16;
private java.lang.Object writingprogram_;
@@ -452,5 +460,4 @@
}
- // optional string source = 17;
public static final int SOURCE_FIELD_NUMBER = 17;
private java.lang.Object source_;
@@ -507,5 +514,4 @@
}
- // optional int64 osmosis_replication_timestamp = 32;
public static final int OSMOSIS_REPLICATION_TIMESTAMP_FIELD_NUMBER = 32;
private long osmosisReplicationTimestamp_;
@@ -535,5 +541,4 @@
}
- // optional int64 osmosis_replication_sequence_number = 33;
public static final int OSMOSIS_REPLICATION_SEQUENCE_NUMBER_FIELD_NUMBER = 33;
private long osmosisReplicationSequenceNumber_;
@@ -559,5 +564,4 @@
}
- // optional string osmosis_replication_base_url = 34;
public static final int OSMOSIS_REPLICATION_BASE_URL_FIELD_NUMBER = 34;
private java.lang.Object osmosisReplicationBaseUrl_;
@@ -627,5 +631,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (hasBbox()) {
@@ -666,4 +671,5 @@
output.writeBytes(34, getOsmosisReplicationBaseUrlBytes());
}
+ output.writeRawBytes(unknownFields);
}
@@ -716,4 +722,5 @@
.computeBytesSize(34, getOsmosisReplicationBaseUrlBytes());
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -793,5 +800,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.HeaderBlock, Builder>
- implements crosby.binary.Osmformat.HeaderBlockOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.HeaderBlock)
+ crosby.binary.Osmformat.HeaderBlockOrBuilder {
// Construct using crosby.binary.Osmformat.HeaderBlock.newBuilder()
private Builder() {
@@ -851,12 +860,10 @@
result.bbox_ = bbox_;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- requiredFeatures_ = new com.google.protobuf.UnmodifiableLazyStringList(
- requiredFeatures_);
+ requiredFeatures_ = requiredFeatures_.getUnmodifiableView();
bitField0_ = (bitField0_ & ~0x00000002);
}
result.requiredFeatures_ = requiredFeatures_;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- optionalFeatures_ = new com.google.protobuf.UnmodifiableLazyStringList(
- optionalFeatures_);
+ optionalFeatures_ = optionalFeatures_.getUnmodifiableView();
bitField0_ = (bitField0_ & ~0x00000004);
}
@@ -932,4 +939,6 @@
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -964,5 +973,4 @@
private int bitField0_;
- // optional .OSMPBF.HeaderBBox bbox = 1;
private crosby.binary.Osmformat.HeaderBBox bbox_ = crosby.binary.Osmformat.HeaderBBox.getDefaultInstance();
/**
@@ -1025,5 +1033,4 @@
}
- // repeated string required_features = 4;
private com.google.protobuf.LazyStringList requiredFeatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
private void ensureRequiredFeaturesIsMutable() {
@@ -1040,7 +1047,7 @@
*
*/
- public java.util.List
+ public com.google.protobuf.ProtocolStringList
getRequiredFeaturesList() {
- return java.util.Collections.unmodifiableList(requiredFeatures_);
+ return requiredFeatures_.getUnmodifiableView();
}
/**
@@ -1119,5 +1126,6 @@
java.lang.Iterable values) {
ensureRequiredFeaturesIsMutable();
- super.addAll(values, requiredFeatures_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, requiredFeatures_);
return this;
@@ -1154,5 +1162,4 @@
}
- // repeated string optional_features = 5;
private com.google.protobuf.LazyStringList optionalFeatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
private void ensureOptionalFeaturesIsMutable() {
@@ -1165,7 +1172,7 @@
* repeated string optional_features = 5;
*/
- public java.util.List
+ public com.google.protobuf.ProtocolStringList
getOptionalFeaturesList() {
- return java.util.Collections.unmodifiableList(optionalFeatures_);
+ return optionalFeatures_.getUnmodifiableView();
}
/**
@@ -1220,5 +1227,6 @@
java.lang.Iterable values) {
ensureOptionalFeaturesIsMutable();
- super.addAll(values, optionalFeatures_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, optionalFeatures_);
return this;
@@ -1247,5 +1255,4 @@
}
- // optional string writingprogram = 16;
private java.lang.Object writingprogram_ = "";
/**
@@ -1261,7 +1268,10 @@
java.lang.Object ref = writingprogram_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- writingprogram_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ writingprogram_ = s;
+ }
return s;
} else {
@@ -1321,5 +1331,4 @@
}
- // optional string source = 17;
private java.lang.Object source_ = "";
/**
@@ -1343,7 +1352,10 @@
java.lang.Object ref = source_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- source_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ source_ = s;
+ }
return s;
} else {
@@ -1419,5 +1431,4 @@
}
- // optional int64 osmosis_replication_timestamp = 32;
private long osmosisReplicationTimestamp_ ;
/**
@@ -1476,5 +1487,4 @@
}
- // optional int64 osmosis_replication_sequence_number = 33;
private long osmosisReplicationSequenceNumber_ ;
/**
@@ -1525,5 +1535,4 @@
}
- // optional string osmosis_replication_base_url = 34;
private java.lang.Object osmosisReplicationBaseUrl_ = "";
/**
@@ -1547,7 +1556,10 @@
java.lang.Object ref = osmosisReplicationBaseUrl_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- osmosisReplicationBaseUrl_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ osmosisReplicationBaseUrl_ = s;
+ }
return s;
} else {
@@ -1634,8 +1646,8 @@
}
- public interface HeaderBBoxOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // required sint64 left = 1;
+ public interface HeaderBBoxOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.HeaderBBox)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* required sint64 left = 1;
@@ -1647,5 +1659,4 @@
long getLeft();
- // required sint64 right = 2;
/**
* required sint64 right = 2;
@@ -1657,5 +1668,4 @@
long getRight();
- // required sint64 top = 3;
/**
* required sint64 top = 3;
@@ -1667,5 +1677,4 @@
long getTop();
- // required sint64 bottom = 4;
/**
* required sint64 bottom = 4;
@@ -1681,12 +1690,13 @@
*/
public static final class HeaderBBox extends
- com.google.protobuf.GeneratedMessageLite
- implements HeaderBBoxOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.HeaderBBox)
+ HeaderBBoxOrBuilder {
// Use HeaderBBox.newBuilder() to construct.
private HeaderBBox(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private HeaderBBox(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private HeaderBBox(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final HeaderBBox defaultInstance;
@@ -1699,4 +1709,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private HeaderBBox(
com.google.protobuf.CodedInputStream input,
@@ -1705,4 +1716,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -1714,5 +1730,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -1748,4 +1764,11 @@
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -1767,5 +1790,4 @@
private int bitField0_;
- // required sint64 left = 1;
public static final int LEFT_FIELD_NUMBER = 1;
private long left_;
@@ -1783,5 +1805,4 @@
}
- // required sint64 right = 2;
public static final int RIGHT_FIELD_NUMBER = 2;
private long right_;
@@ -1799,5 +1820,4 @@
}
- // required sint64 top = 3;
public static final int TOP_FIELD_NUMBER = 3;
private long top_;
@@ -1815,5 +1835,4 @@
}
- // required sint64 bottom = 4;
public static final int BOTTOM_FIELD_NUMBER = 4;
private long bottom_;
@@ -1840,5 +1859,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasLeft()) {
@@ -1877,4 +1897,5 @@
output.writeSInt64(4, bottom_);
}
+ output.writeRawBytes(unknownFields);
}
@@ -1901,4 +1922,5 @@
.computeSInt64Size(4, bottom_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -1978,5 +2000,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.HeaderBBox, Builder>
- implements crosby.binary.Osmformat.HeaderBBoxOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.HeaderBBox)
+ crosby.binary.Osmformat.HeaderBBoxOrBuilder {
// Construct using crosby.binary.Osmformat.HeaderBBox.newBuilder()
private Builder() {
@@ -2057,4 +2081,6 @@
setBottom(other.getBottom());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -2099,5 +2125,4 @@
private int bitField0_;
- // required sint64 left = 1;
private long left_ ;
/**
@@ -2132,5 +2157,4 @@
}
- // required sint64 right = 2;
private long right_ ;
/**
@@ -2165,5 +2189,4 @@
}
- // required sint64 top = 3;
private long top_ ;
/**
@@ -2198,5 +2221,4 @@
}
- // required sint64 bottom = 4;
private long bottom_ ;
/**
@@ -2242,8 +2264,8 @@
}
- public interface PrimitiveBlockOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // required .OSMPBF.StringTable stringtable = 1;
+ public interface PrimitiveBlockOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.PrimitiveBlock)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* required .OSMPBF.StringTable stringtable = 1;
@@ -2255,5 +2277,4 @@
crosby.binary.Osmformat.StringTable getStringtable();
- // repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
@@ -2270,5 +2291,4 @@
int getPrimitivegroupCount();
- // optional int32 granularity = 17 [default = 100];
/**
* optional int32 granularity = 17 [default = 100];
@@ -2288,5 +2308,4 @@
int getGranularity();
- // optional int64 lat_offset = 19 [default = 0];
/**
* optional int64 lat_offset = 19 [default = 0];
@@ -2306,5 +2325,4 @@
long getLatOffset();
- // optional int64 lon_offset = 20 [default = 0];
/**
* optional int64 lon_offset = 20 [default = 0];
@@ -2316,5 +2334,4 @@
long getLonOffset();
- // optional int32 date_granularity = 18 [default = 1000];
/**
* optional int32 date_granularity = 18 [default = 1000];
@@ -2338,12 +2355,13 @@
*/
public static final class PrimitiveBlock extends
- com.google.protobuf.GeneratedMessageLite
- implements PrimitiveBlockOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.PrimitiveBlock)
+ PrimitiveBlockOrBuilder {
// Use PrimitiveBlock.newBuilder() to construct.
private PrimitiveBlock(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private PrimitiveBlock(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private PrimitiveBlock(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final PrimitiveBlock defaultInstance;
@@ -2356,4 +2374,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private PrimitiveBlock(
com.google.protobuf.CodedInputStream input,
@@ -2362,4 +2381,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -2371,5 +2395,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -2429,4 +2453,11 @@
primitivegroup_ = java.util.Collections.unmodifiableList(primitivegroup_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -2448,5 +2479,4 @@
private int bitField0_;
- // required .OSMPBF.StringTable stringtable = 1;
public static final int STRINGTABLE_FIELD_NUMBER = 1;
private crosby.binary.Osmformat.StringTable stringtable_;
@@ -2464,5 +2494,4 @@
}
- // repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
public static final int PRIMITIVEGROUP_FIELD_NUMBER = 2;
private java.util.List primitivegroup_;
@@ -2500,5 +2529,4 @@
}
- // optional int32 granularity = 17 [default = 100];
public static final int GRANULARITY_FIELD_NUMBER = 17;
private int granularity_;
@@ -2524,5 +2552,4 @@
}
- // optional int64 lat_offset = 19 [default = 0];
public static final int LAT_OFFSET_FIELD_NUMBER = 19;
private long latOffset_;
@@ -2548,5 +2575,4 @@
}
- // optional int64 lon_offset = 20 [default = 0];
public static final int LON_OFFSET_FIELD_NUMBER = 20;
private long lonOffset_;
@@ -2564,5 +2590,4 @@
}
- // optional int32 date_granularity = 18 [default = 1000];
public static final int DATE_GRANULARITY_FIELD_NUMBER = 18;
private int dateGranularity_;
@@ -2599,5 +2624,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasStringtable()) {
@@ -2636,4 +2662,5 @@
output.writeInt64(20, lonOffset_);
}
+ output.writeRawBytes(unknownFields);
}
@@ -2668,4 +2695,5 @@
.computeInt64Size(20, lonOffset_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -2745,5 +2773,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.PrimitiveBlock, Builder>
- implements crosby.binary.Osmformat.PrimitiveBlockOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.PrimitiveBlock)
+ crosby.binary.Osmformat.PrimitiveBlockOrBuilder {
// Construct using crosby.binary.Osmformat.PrimitiveBlock.newBuilder()
private Builder() {
@@ -2850,4 +2880,6 @@
setDateGranularity(other.getDateGranularity());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -2886,5 +2918,4 @@
private int bitField0_;
- // required .OSMPBF.StringTable stringtable = 1;
private crosby.binary.Osmformat.StringTable stringtable_ = crosby.binary.Osmformat.StringTable.getDefaultInstance();
/**
@@ -2947,5 +2978,4 @@
}
- // repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
private java.util.List primitivegroup_ =
java.util.Collections.emptyList();
@@ -3049,5 +3079,6 @@
java.lang.Iterable values) {
ensurePrimitivegroupIsMutable();
- super.addAll(values, primitivegroup_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, primitivegroup_);
return this;
@@ -3072,5 +3103,4 @@
}
- // optional int32 granularity = 17 [default = 100];
private int granularity_ = 100;
/**
@@ -3121,5 +3151,4 @@
}
- // optional int64 lat_offset = 19 [default = 0];
private long latOffset_ ;
/**
@@ -3170,5 +3199,4 @@
}
- // optional int64 lon_offset = 20 [default = 0];
private long lonOffset_ ;
/**
@@ -3203,5 +3231,4 @@
}
- // optional int32 date_granularity = 18 [default = 1000];
private int dateGranularity_ = 1000;
/**
@@ -3263,8 +3290,8 @@
}
- public interface PrimitiveGroupOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // repeated .OSMPBF.Node nodes = 1;
+ public interface PrimitiveGroupOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.PrimitiveGroup)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* repeated .OSMPBF.Node nodes = 1;
@@ -3281,5 +3308,4 @@
int getNodesCount();
- // optional .OSMPBF.DenseNodes dense = 2;
/**
* optional .OSMPBF.DenseNodes dense = 2;
@@ -3291,5 +3317,4 @@
crosby.binary.Osmformat.DenseNodes getDense();
- // repeated .OSMPBF.Way ways = 3;
/**
* repeated .OSMPBF.Way ways = 3;
@@ -3306,5 +3331,4 @@
int getWaysCount();
- // repeated .OSMPBF.Relation relations = 4;
/**
* repeated .OSMPBF.Relation relations = 4;
@@ -3321,5 +3345,4 @@
int getRelationsCount();
- // repeated .OSMPBF.ChangeSet changesets = 5;
/**
* repeated .OSMPBF.ChangeSet changesets = 5;
@@ -3344,12 +3367,13 @@
*/
public static final class PrimitiveGroup extends
- com.google.protobuf.GeneratedMessageLite
- implements PrimitiveGroupOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.PrimitiveGroup)
+ PrimitiveGroupOrBuilder {
// Use PrimitiveGroup.newBuilder() to construct.
private PrimitiveGroup(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private PrimitiveGroup(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private PrimitiveGroup(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final PrimitiveGroup defaultInstance;
@@ -3362,4 +3386,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private PrimitiveGroup(
com.google.protobuf.CodedInputStream input,
@@ -3368,4 +3393,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -3377,5 +3407,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -3448,4 +3478,11 @@
changesets_ = java.util.Collections.unmodifiableList(changesets_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -3467,5 +3504,4 @@
private int bitField0_;
- // repeated .OSMPBF.Node nodes = 1;
public static final int NODES_FIELD_NUMBER = 1;
private java.util.List nodes_;
@@ -3503,5 +3539,4 @@
}
- // optional .OSMPBF.DenseNodes dense = 2;
public static final int DENSE_FIELD_NUMBER = 2;
private crosby.binary.Osmformat.DenseNodes dense_;
@@ -3519,5 +3554,4 @@
}
- // repeated .OSMPBF.Way ways = 3;
public static final int WAYS_FIELD_NUMBER = 3;
private java.util.List ways_;
@@ -3555,5 +3589,4 @@
}
- // repeated .OSMPBF.Relation relations = 4;
public static final int RELATIONS_FIELD_NUMBER = 4;
private java.util.List relations_;
@@ -3591,5 +3624,4 @@
}
- // repeated .OSMPBF.ChangeSet changesets = 5;
public static final int CHANGESETS_FIELD_NUMBER = 5;
private java.util.List changesets_;
@@ -3637,5 +3669,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getNodesCount(); i++) {
@@ -3685,4 +3718,5 @@
output.writeMessage(5, changesets_.get(i));
}
+ output.writeRawBytes(unknownFields);
}
@@ -3713,4 +3747,5 @@
.computeMessageSize(5, changesets_.get(i));
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -3794,5 +3829,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.PrimitiveGroup, Builder>
- implements crosby.binary.Osmformat.PrimitiveGroupOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.PrimitiveGroup)
+ crosby.binary.Osmformat.PrimitiveGroupOrBuilder {
// Construct using crosby.binary.Osmformat.PrimitiveGroup.newBuilder()
private Builder() {
@@ -3914,4 +3951,6 @@
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -3964,5 +4003,4 @@
private int bitField0_;
- // repeated .OSMPBF.Node nodes = 1;
private java.util.List nodes_ =
java.util.Collections.emptyList();
@@ -4066,5 +4104,6 @@
java.lang.Iterable values) {
ensureNodesIsMutable();
- super.addAll(values, nodes_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, nodes_);
return this;
@@ -4089,5 +4128,4 @@
}
- // optional .OSMPBF.DenseNodes dense = 2;
private crosby.binary.Osmformat.DenseNodes dense_ = crosby.binary.Osmformat.DenseNodes.getDefaultInstance();
/**
@@ -4150,5 +4188,4 @@
}
- // repeated .OSMPBF.Way ways = 3;
private java.util.List ways_ =
java.util.Collections.emptyList();
@@ -4252,5 +4289,6 @@
java.lang.Iterable values) {
ensureWaysIsMutable();
- super.addAll(values, ways_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, ways_);
return this;
@@ -4275,5 +4313,4 @@
}
- // repeated .OSMPBF.Relation relations = 4;
private java.util.List relations_ =
java.util.Collections.emptyList();
@@ -4377,5 +4414,6 @@
java.lang.Iterable values) {
ensureRelationsIsMutable();
- super.addAll(values, relations_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, relations_);
return this;
@@ -4400,5 +4438,4 @@
}
- // repeated .OSMPBF.ChangeSet changesets = 5;
private java.util.List changesets_ =
java.util.Collections.emptyList();
@@ -4502,5 +4539,6 @@
java.lang.Iterable values) {
ensureChangesetsIsMutable();
- super.addAll(values, changesets_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, changesets_);
return this;
@@ -4536,8 +4574,8 @@
}
- public interface StringTableOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // repeated bytes s = 1;
+ public interface StringTableOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.StringTable)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* repeated bytes s = 1;
@@ -4558,5 +4596,4 @@
*
** String table, contains the common strings in each block.
- *
*Note that we reserve index '0' as a delimiter, so the entry at that
*index in the table is ALWAYS blank and unused.
@@ -4564,12 +4601,13 @@
*/
public static final class StringTable extends
- com.google.protobuf.GeneratedMessageLite
- implements StringTableOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.StringTable)
+ StringTableOrBuilder {
// Use StringTable.newBuilder() to construct.
private StringTable(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private StringTable(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private StringTable(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final StringTable defaultInstance;
@@ -4582,4 +4620,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private StringTable(
com.google.protobuf.CodedInputStream input,
@@ -4588,4 +4627,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -4597,5 +4641,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -4622,4 +4666,11 @@
s_ = java.util.Collections.unmodifiableList(s_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -4640,5 +4691,4 @@
}
- // repeated bytes s = 1;
public static final int S_FIELD_NUMBER = 1;
private java.util.List s_;
@@ -4669,5 +4719,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
@@ -4681,4 +4732,5 @@
output.writeBytes(1, s_.get(i));
}
+ output.writeRawBytes(unknownFields);
}
@@ -4698,4 +4750,5 @@
size += 1 * getSList().size();
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -4774,5 +4827,4 @@
*
** String table, contains the common strings in each block.
- *
*Note that we reserve index '0' as a delimiter, so the entry at that
*index in the table is ALWAYS blank and unused.
@@ -4782,5 +4834,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.StringTable, Builder>
- implements crosby.binary.Osmformat.StringTableOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.StringTable)
+ crosby.binary.Osmformat.StringTableOrBuilder {
// Construct using crosby.binary.Osmformat.StringTable.newBuilder()
private Builder() {
@@ -4840,4 +4894,6 @@
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -4866,5 +4922,4 @@
private int bitField0_;
- // repeated bytes s = 1;
private java.util.List s_ = java.util.Collections.emptyList();
private void ensureSIsMutable() {
@@ -4924,5 +4979,6 @@
java.lang.Iterable values) {
ensureSIsMutable();
- super.addAll(values, s_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, s_);
return this;
@@ -4949,8 +5005,8 @@
}
- public interface InfoOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // optional int32 version = 1 [default = -1];
+ public interface InfoOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.Info)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* optional int32 version = 1 [default = -1];
@@ -4962,5 +5018,4 @@
int getVersion();
- // optional int64 timestamp = 2;
/**
* optional int64 timestamp = 2;
@@ -4972,5 +5027,4 @@
long getTimestamp();
- // optional int64 changeset = 3;
/**
* optional int64 changeset = 3;
@@ -4982,5 +5036,4 @@
long getChangeset();
- // optional int32 uid = 4;
/**
* optional int32 uid = 4;
@@ -4992,5 +5045,4 @@
int getUid();
- // optional uint32 user_sid = 5;
/**
* optional uint32 user_sid = 5;
@@ -5010,5 +5062,4 @@
int getUserSid();
- // optional bool visible = 6;
/**
* optional bool visible = 6;
@@ -5050,12 +5101,13 @@
*/
public static final class Info extends
- com.google.protobuf.GeneratedMessageLite
- implements InfoOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.Info)
+ InfoOrBuilder {
// Use Info.newBuilder() to construct.
private Info(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private Info(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private Info(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final Info defaultInstance;
@@ -5068,4 +5120,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private Info(
com.google.protobuf.CodedInputStream input,
@@ -5074,4 +5127,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -5083,5 +5141,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -5127,4 +5185,11 @@
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -5146,5 +5211,4 @@
private int bitField0_;
- // optional int32 version = 1 [default = -1];
public static final int VERSION_FIELD_NUMBER = 1;
private int version_;
@@ -5162,5 +5226,4 @@
}
- // optional int64 timestamp = 2;
public static final int TIMESTAMP_FIELD_NUMBER = 2;
private long timestamp_;
@@ -5178,5 +5241,4 @@
}
- // optional int64 changeset = 3;
public static final int CHANGESET_FIELD_NUMBER = 3;
private long changeset_;
@@ -5194,5 +5256,4 @@
}
- // optional int32 uid = 4;
public static final int UID_FIELD_NUMBER = 4;
private int uid_;
@@ -5210,5 +5271,4 @@
}
- // optional uint32 user_sid = 5;
public static final int USER_SID_FIELD_NUMBER = 5;
private int userSid_;
@@ -5234,5 +5294,4 @@
}
- // optional bool visible = 6;
public static final int VISIBLE_FIELD_NUMBER = 6;
private boolean visible_;
@@ -5283,5 +5342,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
@@ -5310,4 +5370,5 @@
output.writeBool(6, visible_);
}
+ output.writeRawBytes(unknownFields);
}
@@ -5342,4 +5403,5 @@
.computeBoolSize(6, visible_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -5423,5 +5485,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.Info, Builder>
- implements crosby.binary.Osmformat.InfoOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.Info)
+ crosby.binary.Osmformat.InfoOrBuilder {
// Construct using crosby.binary.Osmformat.Info.newBuilder()
private Builder() {
@@ -5520,4 +5584,6 @@
setVisible(other.getVisible());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -5546,5 +5612,4 @@
private int bitField0_;
- // optional int32 version = 1 [default = -1];
private int version_ = -1;
/**
@@ -5579,5 +5644,4 @@
}
- // optional int64 timestamp = 2;
private long timestamp_ ;
/**
@@ -5612,5 +5676,4 @@
}
- // optional int64 changeset = 3;
private long changeset_ ;
/**
@@ -5645,5 +5708,4 @@
}
- // optional int32 uid = 4;
private int uid_ ;
/**
@@ -5678,5 +5740,4 @@
}
- // optional uint32 user_sid = 5;
private int userSid_ ;
/**
@@ -5727,5 +5788,4 @@
}
- // optional bool visible = 6;
private boolean visible_ ;
/**
@@ -5815,8 +5875,8 @@
}
- public interface DenseInfoOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // repeated int32 version = 1 [packed = true];
+ public interface DenseInfoOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.DenseInfo)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* repeated int32 version = 1 [packed = true];
@@ -5832,5 +5892,4 @@
int getVersion(int index);
- // repeated sint64 timestamp = 2 [packed = true];
/**
* repeated sint64 timestamp = 2 [packed = true];
@@ -5858,5 +5917,4 @@
long getTimestamp(int index);
- // repeated sint64 changeset = 3 [packed = true];
/**
* repeated sint64 changeset = 3 [packed = true];
@@ -5884,5 +5942,4 @@
long getChangeset(int index);
- // repeated sint32 uid = 4 [packed = true];
/**
* repeated sint32 uid = 4 [packed = true];
@@ -5910,5 +5967,4 @@
int getUid(int index);
- // repeated sint32 user_sid = 5 [packed = true];
/**
* repeated sint32 user_sid = 5 [packed = true];
@@ -5936,5 +5992,4 @@
int getUserSid(int index);
- // repeated bool visible = 6 [packed = true];
/**
* repeated bool visible = 6 [packed = true];
@@ -5991,12 +6046,13 @@
*/
public static final class DenseInfo extends
- com.google.protobuf.GeneratedMessageLite
- implements DenseInfoOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.DenseInfo)
+ DenseInfoOrBuilder {
// Use DenseInfo.newBuilder() to construct.
private DenseInfo(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private DenseInfo(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private DenseInfo(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final DenseInfo defaultInstance;
@@ -6009,4 +6065,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private DenseInfo(
com.google.protobuf.CodedInputStream input,
@@ -6015,4 +6072,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -6024,5 +6086,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -6182,4 +6244,11 @@
visible_ = java.util.Collections.unmodifiableList(visible_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -6200,5 +6269,4 @@
}
- // repeated int32 version = 1 [packed = true];
public static final int VERSION_FIELD_NUMBER = 1;
private java.util.List version_;
@@ -6224,5 +6292,4 @@
private int versionMemoizedSerializedSize = -1;
- // repeated sint64 timestamp = 2 [packed = true];
public static final int TIMESTAMP_FIELD_NUMBER = 2;
private java.util.List timestamp_;
@@ -6260,5 +6327,4 @@
private int timestampMemoizedSerializedSize = -1;
- // repeated sint64 changeset = 3 [packed = true];
public static final int CHANGESET_FIELD_NUMBER = 3;
private java.util.List changeset_;
@@ -6296,5 +6362,4 @@
private int changesetMemoizedSerializedSize = -1;
- // repeated sint32 uid = 4 [packed = true];
public static final int UID_FIELD_NUMBER = 4;
private java.util.List uid_;
@@ -6332,5 +6397,4 @@
private int uidMemoizedSerializedSize = -1;
- // repeated sint32 user_sid = 5 [packed = true];
public static final int USER_SID_FIELD_NUMBER = 5;
private java.util.List userSid_;
@@ -6368,5 +6432,4 @@
private int userSidMemoizedSerializedSize = -1;
- // repeated bool visible = 6 [packed = true];
public static final int VISIBLE_FIELD_NUMBER = 6;
private java.util.List visible_;
@@ -6436,5 +6499,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
@@ -6487,4 +6551,5 @@
output.writeBoolNoTag(visible_.get(i));
}
+ output.writeRawBytes(unknownFields);
}
@@ -6576,4 +6641,5 @@
visibleMemoizedSerializedSize = dataSize;
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -6657,5 +6723,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.DenseInfo, Builder>
- implements crosby.binary.Osmformat.DenseInfoOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.DenseInfo)
+ crosby.binary.Osmformat.DenseInfoOrBuilder {
// Construct using crosby.binary.Osmformat.DenseInfo.newBuilder()
private Builder() {
@@ -6800,4 +6868,6 @@
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -6826,5 +6896,4 @@
private int bitField0_;
- // repeated int32 version = 1 [packed = true];
private java.util.List version_ = java.util.Collections.emptyList();
private void ensureVersionIsMutable() {
@@ -6878,5 +6947,6 @@
java.lang.Iterable values) {
ensureVersionIsMutable();
- super.addAll(values, version_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, version_);
return this;
@@ -6892,5 +6962,4 @@
}
- // repeated sint64 timestamp = 2 [packed = true];
private java.util.List timestamp_ = java.util.Collections.emptyList();
private void ensureTimestampIsMutable() {
@@ -6968,5 +7037,6 @@
java.lang.Iterable values) {
ensureTimestampIsMutable();
- super.addAll(values, timestamp_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, timestamp_);
return this;
@@ -6986,5 +7056,4 @@
}
- // repeated sint64 changeset = 3 [packed = true];
private java.util.List changeset_ = java.util.Collections.emptyList();
private void ensureChangesetIsMutable() {
@@ -7062,5 +7131,6 @@
java.lang.Iterable values) {
ensureChangesetIsMutable();
- super.addAll(values, changeset_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, changeset_);
return this;
@@ -7080,5 +7150,4 @@
}
- // repeated sint32 uid = 4 [packed = true];
private java.util.List uid_ = java.util.Collections.emptyList();
private void ensureUidIsMutable() {
@@ -7156,5 +7225,6 @@
java.lang.Iterable values) {
ensureUidIsMutable();
- super.addAll(values, uid_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, uid_);
return this;
@@ -7174,5 +7244,4 @@
}
- // repeated sint32 user_sid = 5 [packed = true];
private java.util.List userSid_ = java.util.Collections.emptyList();
private void ensureUserSidIsMutable() {
@@ -7250,5 +7319,6 @@
java.lang.Iterable values) {
ensureUserSidIsMutable();
- super.addAll(values, userSid_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, userSid_);
return this;
@@ -7268,5 +7338,4 @@
}
- // repeated bool visible = 6 [packed = true];
private java.util.List visible_ = java.util.Collections.emptyList();
private void ensureVisibleIsMutable() {
@@ -7386,5 +7455,6 @@
java.lang.Iterable values) {
ensureVisibleIsMutable();
- super.addAll(values, visible_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, visible_);
return this;
@@ -7422,8 +7492,8 @@
}
- public interface ChangeSetOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // required int64 id = 1;
+ public interface ChangeSetOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.ChangeSet)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* required int64 id = 1;
@@ -7434,5 +7504,4 @@
* repeated uint32 keys = 2 [packed = true]; // String IDs.
* repeated uint32 vals = 3 [packed = true]; // String IDs.
- *
* optional Info info = 4;
*
@@ -7447,5 +7516,4 @@
* repeated uint32 keys = 2 [packed = true]; // String IDs.
* repeated uint32 vals = 3 [packed = true]; // String IDs.
- *
* optional Info info = 4;
*
@@ -7462,12 +7530,13 @@
*/
public static final class ChangeSet extends
- com.google.protobuf.GeneratedMessageLite
- implements ChangeSetOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.ChangeSet)
+ ChangeSetOrBuilder {
// Use ChangeSet.newBuilder() to construct.
private ChangeSet(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private ChangeSet(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private ChangeSet(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final ChangeSet defaultInstance;
@@ -7480,4 +7549,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private ChangeSet(
com.google.protobuf.CodedInputStream input,
@@ -7486,4 +7556,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -7495,5 +7570,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -7514,4 +7589,11 @@
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -7533,5 +7615,4 @@
private int bitField0_;
- // required int64 id = 1;
public static final int ID_FIELD_NUMBER = 1;
private long id_;
@@ -7544,5 +7625,4 @@
* repeated uint32 keys = 2 [packed = true]; // String IDs.
* repeated uint32 vals = 3 [packed = true]; // String IDs.
- *
* optional Info info = 4;
*
@@ -7559,5 +7639,4 @@
* repeated uint32 keys = 2 [packed = true]; // String IDs.
* repeated uint32 vals = 3 [packed = true]; // String IDs.
- *
* optional Info info = 4;
*
@@ -7573,5 +7652,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasId()) {
@@ -7589,4 +7669,5 @@
output.writeInt64(1, id_);
}
+ output.writeRawBytes(unknownFields);
}
@@ -7601,4 +7682,5 @@
.computeInt64Size(1, id_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -7683,5 +7765,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.ChangeSet, Builder>
- implements crosby.binary.Osmformat.ChangeSetOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.ChangeSet)
+ crosby.binary.Osmformat.ChangeSetOrBuilder {
// Construct using crosby.binary.Osmformat.ChangeSet.newBuilder()
private Builder() {
@@ -7735,4 +7819,6 @@
setId(other.getId());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -7765,5 +7851,4 @@
private int bitField0_;
- // required int64 id = 1;
private long id_ ;
/**
@@ -7775,5 +7860,4 @@
* repeated uint32 keys = 2 [packed = true]; // String IDs.
* repeated uint32 vals = 3 [packed = true]; // String IDs.
- *
* optional Info info = 4;
*
@@ -7790,5 +7874,4 @@
* repeated uint32 keys = 2 [packed = true]; // String IDs.
* repeated uint32 vals = 3 [packed = true]; // String IDs.
- *
* optional Info info = 4;
*
@@ -7805,5 +7888,4 @@
* repeated uint32 keys = 2 [packed = true]; // String IDs.
* repeated uint32 vals = 3 [packed = true]; // String IDs.
- *
* optional Info info = 4;
*
@@ -7823,5 +7905,4 @@
* repeated uint32 keys = 2 [packed = true]; // String IDs.
* repeated uint32 vals = 3 [packed = true]; // String IDs.
- *
* optional Info info = 4;
*
@@ -7845,8 +7926,8 @@
}
- public interface NodeOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // required sint64 id = 1;
+ public interface NodeOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.Node)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* required sint64 id = 1;
@@ -7858,5 +7939,4 @@
long getId();
- // repeated uint32 keys = 2 [packed = true];
/**
* repeated uint32 keys = 2 [packed = true];
@@ -7884,5 +7964,4 @@
int getKeys(int index);
- // repeated uint32 vals = 3 [packed = true];
/**
* repeated uint32 vals = 3 [packed = true];
@@ -7910,5 +7989,4 @@
int getVals(int index);
- // optional .OSMPBF.Info info = 4;
/**
* optional .OSMPBF.Info info = 4;
@@ -7928,5 +8006,4 @@
crosby.binary.Osmformat.Info getInfo();
- // required sint64 lat = 8;
/**
* required sint64 lat = 8;
@@ -7938,5 +8015,4 @@
long getLat();
- // required sint64 lon = 9;
/**
* required sint64 lon = 9;
@@ -7952,12 +8028,13 @@
*/
public static final class Node extends
- com.google.protobuf.GeneratedMessageLite
- implements NodeOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.Node)
+ NodeOrBuilder {
// Use Node.newBuilder() to construct.
private Node(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private Node(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private Node(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final Node defaultInstance;
@@ -7970,4 +8047,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private Node(
com.google.protobuf.CodedInputStream input,
@@ -7976,4 +8054,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -7985,5 +8068,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -8075,4 +8158,11 @@
vals_ = java.util.Collections.unmodifiableList(vals_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -8094,5 +8184,4 @@
private int bitField0_;
- // required sint64 id = 1;
public static final int ID_FIELD_NUMBER = 1;
private long id_;
@@ -8110,5 +8199,4 @@
}
- // repeated uint32 keys = 2 [packed = true];
public static final int KEYS_FIELD_NUMBER = 2;
private java.util.List keys_;
@@ -8146,5 +8234,4 @@
private int keysMemoizedSerializedSize = -1;
- // repeated uint32 vals = 3 [packed = true];
public static final int VALS_FIELD_NUMBER = 3;
private java.util.List vals_;
@@ -8182,5 +8269,4 @@
private int valsMemoizedSerializedSize = -1;
- // optional .OSMPBF.Info info = 4;
public static final int INFO_FIELD_NUMBER = 4;
private crosby.binary.Osmformat.Info info_;
@@ -8206,5 +8292,4 @@
}
- // required sint64 lat = 8;
public static final int LAT_FIELD_NUMBER = 8;
private long lat_;
@@ -8222,5 +8307,4 @@
}
- // required sint64 lon = 9;
public static final int LON_FIELD_NUMBER = 9;
private long lon_;
@@ -8249,5 +8333,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasId()) {
@@ -8296,4 +8381,5 @@
output.writeSInt64(9, lon_);
}
+ output.writeRawBytes(unknownFields);
}
@@ -8348,4 +8434,5 @@
.computeSInt64Size(9, lon_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -8425,5 +8512,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.Node, Builder>
- implements crosby.binary.Osmformat.NodeOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.Node)
+ crosby.binary.Osmformat.NodeOrBuilder {
// Construct using crosby.binary.Osmformat.Node.newBuilder()
private Builder() {
@@ -8538,4 +8627,6 @@
setLon(other.getLon());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -8576,5 +8667,4 @@
private int bitField0_;
- // required sint64 id = 1;
private long id_ ;
/**
@@ -8609,5 +8699,4 @@
}
- // repeated uint32 keys = 2 [packed = true];
private java.util.List keys_ = java.util.Collections.emptyList();
private void ensureKeysIsMutable() {
@@ -8685,5 +8774,6 @@
java.lang.Iterable values) {
ensureKeysIsMutable();
- super.addAll(values, keys_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, keys_);
return this;
@@ -8703,5 +8793,4 @@
}
- // repeated uint32 vals = 3 [packed = true];
private java.util.List vals_ = java.util.Collections.emptyList();
private void ensureValsIsMutable() {
@@ -8779,5 +8868,6 @@
java.lang.Iterable values) {
ensureValsIsMutable();
- super.addAll(values, vals_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, vals_);
return this;
@@ -8797,5 +8887,4 @@
}
- // optional .OSMPBF.Info info = 4;
private crosby.binary.Osmformat.Info info_ = crosby.binary.Osmformat.Info.getDefaultInstance();
/**
@@ -8882,5 +8971,4 @@
}
- // required sint64 lat = 8;
private long lat_ ;
/**
@@ -8915,5 +9003,4 @@
}
- // required sint64 lon = 9;
private long lon_ ;
/**
@@ -8959,8 +9046,8 @@
}
- public interface DenseNodesOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // repeated sint64 id = 1 [packed = true];
+ public interface DenseNodesOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.DenseNodes)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* repeated sint64 id = 1 [packed = true];
@@ -8988,5 +9075,4 @@
long getId(int index);
- // optional .OSMPBF.DenseInfo denseinfo = 5;
/**
* optional .OSMPBF.DenseInfo denseinfo = 5;
@@ -9006,5 +9092,4 @@
crosby.binary.Osmformat.DenseInfo getDenseinfo();
- // repeated sint64 lat = 8 [packed = true];
/**
* repeated sint64 lat = 8 [packed = true];
@@ -9032,5 +9117,4 @@
long getLat(int index);
- // repeated sint64 lon = 9 [packed = true];
/**
* repeated sint64 lon = 9 [packed = true];
@@ -9058,5 +9142,4 @@
long getLon(int index);
- // repeated int32 keys_vals = 10 [packed = true];
/**
* repeated int32 keys_vals = 10 [packed = true];
@@ -9088,12 +9171,13 @@
*/
public static final class DenseNodes extends
- com.google.protobuf.GeneratedMessageLite
- implements DenseNodesOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.DenseNodes)
+ DenseNodesOrBuilder {
// Use DenseNodes.newBuilder() to construct.
private DenseNodes(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private DenseNodes(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private DenseNodes(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final DenseNodes defaultInstance;
@@ -9106,4 +9190,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private DenseNodes(
com.google.protobuf.CodedInputStream input,
@@ -9112,4 +9197,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -9121,5 +9211,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -9244,4 +9334,11 @@
keysVals_ = java.util.Collections.unmodifiableList(keysVals_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -9263,5 +9360,4 @@
private int bitField0_;
- // repeated sint64 id = 1 [packed = true];
public static final int ID_FIELD_NUMBER = 1;
private java.util.List id_;
@@ -9299,5 +9395,4 @@
private int idMemoizedSerializedSize = -1;
- // optional .OSMPBF.DenseInfo denseinfo = 5;
public static final int DENSEINFO_FIELD_NUMBER = 5;
private crosby.binary.Osmformat.DenseInfo denseinfo_;
@@ -9323,5 +9418,4 @@
}
- // repeated sint64 lat = 8 [packed = true];
public static final int LAT_FIELD_NUMBER = 8;
private java.util.List lat_;
@@ -9359,5 +9453,4 @@
private int latMemoizedSerializedSize = -1;
- // repeated sint64 lon = 9 [packed = true];
public static final int LON_FIELD_NUMBER = 9;
private java.util.List lon_;
@@ -9395,5 +9488,4 @@
private int lonMemoizedSerializedSize = -1;
- // repeated int32 keys_vals = 10 [packed = true];
public static final int KEYS_VALS_FIELD_NUMBER = 10;
private java.util.List keysVals_;
@@ -9441,5 +9533,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
@@ -9481,4 +9574,5 @@
output.writeInt32NoTag(keysVals_.get(i));
}
+ output.writeRawBytes(unknownFields);
}
@@ -9549,4 +9643,5 @@
keysValsMemoizedSerializedSize = dataSize;
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -9626,5 +9721,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.DenseNodes, Builder>
- implements crosby.binary.Osmformat.DenseNodesOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.DenseNodes)
+ crosby.binary.Osmformat.DenseNodesOrBuilder {
// Construct using crosby.binary.Osmformat.DenseNodes.newBuilder()
private Builder() {
@@ -9746,4 +9843,6 @@
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -9772,5 +9871,4 @@
private int bitField0_;
- // repeated sint64 id = 1 [packed = true];
private java.util.List id_ = java.util.Collections.emptyList();
private void ensureIdIsMutable() {
@@ -9848,5 +9946,6 @@
java.lang.Iterable values) {
ensureIdIsMutable();
- super.addAll(values, id_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, id_);
return this;
@@ -9866,5 +9965,4 @@
}
- // optional .OSMPBF.DenseInfo denseinfo = 5;
private crosby.binary.Osmformat.DenseInfo denseinfo_ = crosby.binary.Osmformat.DenseInfo.getDefaultInstance();
/**
@@ -9951,5 +10049,4 @@
}
- // repeated sint64 lat = 8 [packed = true];
private java.util.List lat_ = java.util.Collections.emptyList();
private void ensureLatIsMutable() {
@@ -10027,5 +10124,6 @@
java.lang.Iterable values) {
ensureLatIsMutable();
- super.addAll(values, lat_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, lat_);
return this;
@@ -10045,5 +10143,4 @@
}
- // repeated sint64 lon = 9 [packed = true];
private java.util.List lon_ = java.util.Collections.emptyList();
private void ensureLonIsMutable() {
@@ -10121,5 +10218,6 @@
java.lang.Iterable values) {
ensureLonIsMutable();
- super.addAll(values, lon_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, lon_);
return this;
@@ -10139,5 +10237,4 @@
}
- // repeated int32 keys_vals = 10 [packed = true];
private java.util.List keysVals_ = java.util.Collections.emptyList();
private void ensureKeysValsIsMutable() {
@@ -10215,5 +10312,6 @@
java.lang.Iterable values) {
ensureKeysValsIsMutable();
- super.addAll(values, keysVals_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, keysVals_);
return this;
@@ -10244,8 +10342,8 @@
}
- public interface WayOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // required int64 id = 1;
+ public interface WayOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.Way)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* required int64 id = 1;
@@ -10257,5 +10355,4 @@
long getId();
- // repeated uint32 keys = 2 [packed = true];
/**
* repeated uint32 keys = 2 [packed = true];
@@ -10283,5 +10380,4 @@
int getKeys(int index);
- // repeated uint32 vals = 3 [packed = true];
/**
* repeated uint32 vals = 3 [packed = true];
@@ -10297,5 +10393,4 @@
int getVals(int index);
- // optional .OSMPBF.Info info = 4;
/**
* optional .OSMPBF.Info info = 4;
@@ -10307,5 +10402,4 @@
crosby.binary.Osmformat.Info getInfo();
- // repeated sint64 refs = 8 [packed = true];
/**
* repeated sint64 refs = 8 [packed = true];
@@ -10337,12 +10431,13 @@
*/
public static final class Way extends
- com.google.protobuf.GeneratedMessageLite
- implements WayOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.Way)
+ WayOrBuilder {
// Use Way.newBuilder() to construct.
private Way(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private Way(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private Way(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final Way defaultInstance;
@@ -10355,4 +10450,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private Way(
com.google.protobuf.CodedInputStream input,
@@ -10361,4 +10457,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -10370,5 +10471,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -10474,4 +10575,11 @@
refs_ = java.util.Collections.unmodifiableList(refs_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -10493,5 +10601,4 @@
private int bitField0_;
- // required int64 id = 1;
public static final int ID_FIELD_NUMBER = 1;
private long id_;
@@ -10509,5 +10616,4 @@
}
- // repeated uint32 keys = 2 [packed = true];
public static final int KEYS_FIELD_NUMBER = 2;
private java.util.List keys_;
@@ -10545,5 +10651,4 @@
private int keysMemoizedSerializedSize = -1;
- // repeated uint32 vals = 3 [packed = true];
public static final int VALS_FIELD_NUMBER = 3;
private java.util.List vals_;
@@ -10569,5 +10674,4 @@
private int valsMemoizedSerializedSize = -1;
- // optional .OSMPBF.Info info = 4;
public static final int INFO_FIELD_NUMBER = 4;
private crosby.binary.Osmformat.Info info_;
@@ -10585,5 +10689,4 @@
}
- // repeated sint64 refs = 8 [packed = true];
public static final int REFS_FIELD_NUMBER = 8;
private java.util.List refs_;
@@ -10631,5 +10734,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasId()) {
@@ -10671,4 +10775,5 @@
output.writeSInt64NoTag(refs_.get(i));
}
+ output.writeRawBytes(unknownFields);
}
@@ -10729,4 +10834,5 @@
refsMemoizedSerializedSize = dataSize;
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -10806,5 +10912,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.Way, Builder>
- implements crosby.binary.Osmformat.WayOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.Way)
+ crosby.binary.Osmformat.WayOrBuilder {
// Construct using crosby.binary.Osmformat.Way.newBuilder()
private Builder() {
@@ -10918,4 +11026,6 @@
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -10948,5 +11058,4 @@
private int bitField0_;
- // required int64 id = 1;
private long id_ ;
/**
@@ -10981,5 +11090,4 @@
}
- // repeated uint32 keys = 2 [packed = true];
private java.util.List keys_ = java.util.Collections.emptyList();
private void ensureKeysIsMutable() {
@@ -11057,5 +11165,6 @@
java.lang.Iterable values) {
ensureKeysIsMutable();
- super.addAll(values, keys_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, keys_);
return this;
@@ -11075,5 +11184,4 @@
}
- // repeated uint32 vals = 3 [packed = true];
private java.util.List vals_ = java.util.Collections.emptyList();
private void ensureValsIsMutable() {
@@ -11127,5 +11235,6 @@
java.lang.Iterable values) {
ensureValsIsMutable();
- super.addAll(values, vals_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, vals_);
return this;
@@ -11141,5 +11250,4 @@
}
- // optional .OSMPBF.Info info = 4;
private crosby.binary.Osmformat.Info info_ = crosby.binary.Osmformat.Info.getDefaultInstance();
/**
@@ -11202,5 +11310,4 @@
}
- // repeated sint64 refs = 8 [packed = true];
private java.util.List refs_ = java.util.Collections.emptyList();
private void ensureRefsIsMutable() {
@@ -11278,5 +11385,6 @@
java.lang.Iterable values) {
ensureRefsIsMutable();
- super.addAll(values, refs_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, refs_);
return this;
@@ -11307,8 +11415,8 @@
}
- public interface RelationOrBuilder
- extends com.google.protobuf.MessageLiteOrBuilder {
-
- // required int64 id = 1;
+ public interface RelationOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:OSMPBF.Relation)
+ com.google.protobuf.MessageLiteOrBuilder {
+
/**
* required int64 id = 1;
@@ -11320,5 +11428,4 @@
long getId();
- // repeated uint32 keys = 2 [packed = true];
/**
* repeated uint32 keys = 2 [packed = true];
@@ -11346,5 +11453,4 @@
int getKeys(int index);
- // repeated uint32 vals = 3 [packed = true];
/**
* repeated uint32 vals = 3 [packed = true];
@@ -11360,5 +11466,4 @@
int getVals(int index);
- // optional .OSMPBF.Info info = 4;
/**
* optional .OSMPBF.Info info = 4;
@@ -11370,5 +11475,4 @@
crosby.binary.Osmformat.Info getInfo();
- // repeated int32 roles_sid = 8 [packed = true];
/**
* repeated int32 roles_sid = 8 [packed = true];
@@ -11396,5 +11500,4 @@
int getRolesSid(int index);
- // repeated sint64 memids = 9 [packed = true];
/**
* repeated sint64 memids = 9 [packed = true];
@@ -11422,5 +11525,4 @@
long getMemids(int index);
- // repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];
/**
* repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];
@@ -11440,12 +11542,13 @@
*/
public static final class Relation extends
- com.google.protobuf.GeneratedMessageLite
- implements RelationOrBuilder {
+ com.google.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:OSMPBF.Relation)
+ RelationOrBuilder {
// Use Relation.newBuilder() to construct.
private Relation(com.google.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
- }
- private Relation(boolean noInit) {}
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private Relation(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
private static final Relation defaultInstance;
@@ -11458,4 +11561,5 @@
}
+ private final com.google.protobuf.ByteString unknownFields;
private Relation(
com.google.protobuf.CodedInputStream input,
@@ -11464,4 +11568,9 @@
initFields();
int mutable_bitField0_ = 0;
+ com.google.protobuf.ByteString.Output unknownFieldsOutput =
+ com.google.protobuf.ByteString.newOutput();
+ com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ com.google.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
@@ -11473,5 +11582,5 @@
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
@@ -11584,5 +11693,8 @@
int rawValue = input.readEnum();
crosby.binary.Osmformat.Relation.MemberType value = crosby.binary.Osmformat.Relation.MemberType.valueOf(rawValue);
- if (value != null) {
+ if (value == null) {
+ unknownFieldsCodedOutput.writeRawVarint32(tag);
+ unknownFieldsCodedOutput.writeRawVarint32(rawValue);
+ } else {
if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
types_ = new java.util.ArrayList();
@@ -11599,5 +11711,8 @@
int rawValue = input.readEnum();
crosby.binary.Osmformat.Relation.MemberType value = crosby.binary.Osmformat.Relation.MemberType.valueOf(rawValue);
- if (value != null) {
+ if (value == null) {
+ unknownFieldsCodedOutput.writeRawVarint32(tag);
+ unknownFieldsCodedOutput.writeRawVarint32(rawValue);
+ } else {
if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
types_ = new java.util.ArrayList();
@@ -11633,4 +11748,11 @@
types_ = java.util.Collections.unmodifiableList(types_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
@@ -11717,5 +11839,4 @@
private int bitField0_;
- // required int64 id = 1;
public static final int ID_FIELD_NUMBER = 1;
private long id_;
@@ -11733,5 +11854,4 @@
}
- // repeated uint32 keys = 2 [packed = true];
public static final int KEYS_FIELD_NUMBER = 2;
private java.util.List keys_;
@@ -11769,5 +11889,4 @@
private int keysMemoizedSerializedSize = -1;
- // repeated uint32 vals = 3 [packed = true];
public static final int VALS_FIELD_NUMBER = 3;
private java.util.List vals_;
@@ -11793,5 +11912,4 @@
private int valsMemoizedSerializedSize = -1;
- // optional .OSMPBF.Info info = 4;
public static final int INFO_FIELD_NUMBER = 4;
private crosby.binary.Osmformat.Info info_;
@@ -11809,5 +11927,4 @@
}
- // repeated int32 roles_sid = 8 [packed = true];
public static final int ROLES_SID_FIELD_NUMBER = 8;
private java.util.List rolesSid_;
@@ -11845,5 +11962,4 @@
private int rolesSidMemoizedSerializedSize = -1;
- // repeated sint64 memids = 9 [packed = true];
public static final int MEMIDS_FIELD_NUMBER = 9;
private java.util.List memids_;
@@ -11881,5 +11997,4 @@
private int memidsMemoizedSerializedSize = -1;
- // repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];
public static final int TYPES_FIELD_NUMBER = 10;
private java.util.List types_;
@@ -11916,5 +12031,6 @@
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasId()) {
@@ -11970,4 +12086,5 @@
output.writeEnumNoTag(types_.get(i).getNumber());
}
+ output.writeRawBytes(unknownFields);
}
@@ -12054,4 +12171,5 @@
}typesMemoizedSerializedSize = dataSize;
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
@@ -12131,5 +12249,7 @@
com.google.protobuf.GeneratedMessageLite.Builder<
crosby.binary.Osmformat.Relation, Builder>
- implements crosby.binary.Osmformat.RelationOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:OSMPBF.Relation)
+ crosby.binary.Osmformat.RelationOrBuilder {
// Construct using crosby.binary.Osmformat.Relation.newBuilder()
private Builder() {
@@ -12277,4 +12397,6 @@
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -12307,5 +12429,4 @@
private int bitField0_;
- // required int64 id = 1;
private long id_ ;
/**
@@ -12340,5 +12461,4 @@
}
- // repeated uint32 keys = 2 [packed = true];
private java.util.List keys_ = java.util.Collections.emptyList();
private void ensureKeysIsMutable() {
@@ -12416,5 +12536,6 @@
java.lang.Iterable values) {
ensureKeysIsMutable();
- super.addAll(values, keys_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, keys_);
return this;
@@ -12434,5 +12555,4 @@
}
- // repeated uint32 vals = 3 [packed = true];
private java.util.List vals_ = java.util.Collections.emptyList();
private void ensureValsIsMutable() {
@@ -12486,5 +12606,6 @@
java.lang.Iterable values) {
ensureValsIsMutable();
- super.addAll(values, vals_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, vals_);
return this;
@@ -12500,5 +12621,4 @@
}
- // optional .OSMPBF.Info info = 4;
private crosby.binary.Osmformat.Info info_ = crosby.binary.Osmformat.Info.getDefaultInstance();
/**
@@ -12561,5 +12681,4 @@
}
- // repeated int32 roles_sid = 8 [packed = true];
private java.util.List rolesSid_ = java.util.Collections.emptyList();
private void ensureRolesSidIsMutable() {
@@ -12637,5 +12756,6 @@
java.lang.Iterable values) {
ensureRolesSidIsMutable();
- super.addAll(values, rolesSid_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, rolesSid_);
return this;
@@ -12655,5 +12775,4 @@
}
- // repeated sint64 memids = 9 [packed = true];
private java.util.List memids_ = java.util.Collections.emptyList();
private void ensureMemidsIsMutable() {
@@ -12731,5 +12850,6 @@
java.lang.Iterable values) {
ensureMemidsIsMutable();
- super.addAll(values, memids_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, memids_);
return this;
@@ -12749,5 +12869,4 @@
}
- // repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];
private java.util.List types_ =
java.util.Collections.emptyList();
@@ -12807,5 +12926,6 @@
java.lang.Iterable values) {
ensureTypesIsMutable();
- super.addAll(values, types_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, types_);
return this;
Index: /applications/editors/josm/plugins/pbf/tools/readme.txt
===================================================================
--- /applications/editors/josm/plugins/pbf/tools/readme.txt (revision 30658)
+++ /applications/editors/josm/plugins/pbf/tools/readme.txt (revision 30658)
@@ -0,0 +1,15 @@
+Protocol Buffers - Google's data interchange format
+Copyright 2008 Google Inc.
+http://code.google.com/p/protobuf/
+
+This package contains a precompiled Win32 binary version of the protocol buffer
+compiler (protoc). This binary is intended for Windows users who want to
+use Protocol Buffers in Java or Python but do not want to compile protoc
+themselves. To install, simply place this binary somewhere in your PATH.
+
+This binary was built using MinGW, but the output is the same regardless of
+the C++ compiler used.
+
+You will still need to download the source code package in order to obtain the
+Java or Python runtime libraries. Get it from:
+ http://code.google.com/p/protobuf/downloads/