public Builder mergeFrom(
org.waveprotocol.box.server.persistence.protos.ProtoDeltaStoreData
.ProtoTransformedWaveletDelta
other) {
if (other
== org.waveprotocol.box.server.persistence.protos.ProtoDeltaStoreData
.ProtoTransformedWaveletDelta.getDefaultInstance()) return this;
if (other.hasAuthor()) {
setAuthor(other.getAuthor());
}
if (other.hasResultingVersion()) {
mergeResultingVersion(other.getResultingVersion());
}
if (other.hasApplicationTimestamp()) {
setApplicationTimestamp(other.getApplicationTimestamp());
}
if (!other.operation_.isEmpty()) {
if (result.operation_.isEmpty()) {
result.operation_ =
new java.util.ArrayList<
org.waveprotocol.wave.federation.Proto.ProtocolWaveletOperation>();
}
result.operation_.addAll(other.operation_);
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
public org.waveprotocol.wave.federation.Proto.ProtocolHashedVersion getResultingVersion() {
return result.getResultingVersion();
}