public Builder mergeFrom(
com.xinqihd.sns.gameserver.proto.XinqiBseShopping.BseShopping other) {
if (other
== com.xinqihd.sns.gameserver.proto.XinqiBseShopping.BseShopping.getDefaultInstance())
return this;
if (other.hasType()) {
setType(other.getType());
}
if (other.hasGender()) {
setGender(other.getGender());
}
if (goodsInfoBuilder_ == null) {
if (!other.goodsInfo_.isEmpty()) {
if (goodsInfo_.isEmpty()) {
goodsInfo_ = other.goodsInfo_;
bitField0_ = (bitField0_ & ~0x00000004);
} else {
ensureGoodsInfoIsMutable();
goodsInfo_.addAll(other.goodsInfo_);
}
onChanged();
}
} else {
if (!other.goodsInfo_.isEmpty()) {
if (goodsInfoBuilder_.isEmpty()) {
goodsInfoBuilder_.dispose();
goodsInfoBuilder_ = null;
goodsInfo_ = other.goodsInfo_;
bitField0_ = (bitField0_ & ~0x00000004);
goodsInfoBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders
? getGoodsInfoFieldBuilder()
: null;
} else {
goodsInfoBuilder_.addAllMessages(other.goodsInfo_);
}
}
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
