Author: al
Date: Sat Jun 8 11:04:12 2013
New Revision: 1490949
URL: http://svn.apache.org/r1490949
Log:
Add TM to logo, add some missing license headers
Removed:
incubator/wave/trunk/src/org/waveprotocol/box/webclient/client/logo.gif
Modified:
incubator/wave/trunk/.classpath
incubator/wave/trunk/.gitignore
incubator/wave/trunk/.project
incubator/wave/trunk/.project_template
incubator/wave/trunk/jaas.config
incubator/wave/trunk/proto_src/org/waveprotocol/box/attachment/AttachmentProto.java
incubator/wave/trunk/proto_src/org/waveprotocol/box/server/persistence/protos/ProtoAccountStoreData.java
incubator/wave/trunk/server-config.xml
incubator/wave/trunk/server.federation.config
incubator/wave/trunk/war/.gitignore
incubator/wave/trunk/war/static/logo.png
Modified: incubator/wave/trunk/.classpath
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/.classpath?rev=1490949&r1=1490948&r2=1490949&view=diff
==============================================================================
--- incubator/wave/trunk/.classpath (original)
+++ incubator/wave/trunk/.classpath Sat Jun 8 11:04:12 2013
@@ -1,3 +1,16 @@
+<!--
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
@@ -35,7 +48,7 @@
<classpathentry kind="lib"
path="third_party/runtime/joda_time/joda-time-1.6.jar"/>
<classpathentry kind="lib"
path="third_party/runtime/jsr305/jsr305-src.jar"/>
<classpathentry kind="lib"
path="third_party/runtime/jsr305/jsr305.jar"/>
- <classpathentry kind="lib"
path="third_party/runtime/libidn/libidn-1.15.jar"/>
+ <classpathentry kind="lib"
path="third_party/runtime/libidn/libidn-1.26.jar"/>
<classpathentry kind="lib"
path="third_party/runtime/mongo-driver/mongo-2.1.jar"
sourcepath="third_party/runtime/mongo-driver/mongo-java-driver-r2.1-0-src.zip"/>
<classpathentry kind="lib"
path="third_party/runtime/oauth/oauth-common.jar"
sourcepath="third_party/runtime/oauth/oauth-common-src.jar"/>
<classpathentry kind="lib"
path="third_party/runtime/oauth/oauth-consumer.jar"
sourcepath="third_party/runtime/oauth/oauth-consumer-src.jar"/>
Modified: incubator/wave/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/.gitignore?rev=1490949&r1=1490948&r2=1490949&view=diff
==============================================================================
--- incubator/wave/trunk/.gitignore (original)
+++ incubator/wave/trunk/.gitignore Sat Jun 8 11:04:12 2013
@@ -1,3 +1,15 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
/build
/test_out
/dist
Modified: incubator/wave/trunk/.project
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/.project?rev=1490949&r1=1490948&r2=1490949&view=diff
==============================================================================
--- incubator/wave/trunk/.project (original)
+++ incubator/wave/trunk/.project Sat Jun 8 11:04:12 2013
@@ -1,3 +1,16 @@
+<!--
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>wave-protocol</name>
Modified: incubator/wave/trunk/.project_template
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/.project_template?rev=1490949&r1=1490948&r2=1490949&view=diff
==============================================================================
--- incubator/wave/trunk/.project_template (original)
+++ incubator/wave/trunk/.project_template Sat Jun 8 11:04:12 2013
@@ -1,3 +1,16 @@
+<!--
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>PROJECT_NAME</name>
Modified: incubator/wave/trunk/jaas.config
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/jaas.config?rev=1490949&r1=1490948&r2=1490949&view=diff
==============================================================================
--- incubator/wave/trunk/jaas.config (original)
+++ incubator/wave/trunk/jaas.config Sat Jun 8 11:04:12 2013
@@ -1,3 +1,15 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
Wave {
org.waveprotocol.box.server.authentication.AccountStoreLoginModule required
debug=true;
};
Modified:
incubator/wave/trunk/proto_src/org/waveprotocol/box/attachment/AttachmentProto.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/proto_src/org/waveprotocol/box/attachment/AttachmentProto.java?rev=1490949&r1=1490948&r2=1490949&view=diff
==============================================================================
---
incubator/wave/trunk/proto_src/org/waveprotocol/box/attachment/AttachmentProto.java
(original)
+++
incubator/wave/trunk/proto_src/org/waveprotocol/box/attachment/AttachmentProto.java
Sat Jun 8 11:04:12 2013
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: org/waveprotocol/box/attachment/attachment.proto
@@ -15,26 +34,26 @@ public final class AttachmentProto {
initFields();
}
private AttachmentsResponse(boolean noInit) {}
-
+
private static final AttachmentsResponse defaultInstance;
public static AttachmentsResponse getDefaultInstance() {
return defaultInstance;
}
-
+
public AttachmentsResponse getDefaultInstanceForType() {
return defaultInstance;
}
-
+
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return
org.waveprotocol.box.attachment.AttachmentProto.internal_static_attachment_AttachmentsResponse_descriptor;
}
-
+
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return
org.waveprotocol.box.attachment.AttachmentProto.internal_static_attachment_AttachmentsResponse_fieldAccessorTable;
}
-
+
// repeated .attachment.AttachmentMetadata attachment = 1;
public static final int ATTACHMENT_FIELD_NUMBER = 1;
private
java.util.List<org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata>
attachment_ =
@@ -46,7 +65,7 @@ public final class AttachmentProto {
public org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata
getAttachment(int index) {
return attachment_.get(index);
}
-
+
private void initFields() {
}
public final boolean isInitialized() {
@@ -55,7 +74,7 @@ public final class AttachmentProto {
}
return true;
}
-
+
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
@@ -64,12 +83,12 @@ public final class AttachmentProto {
}
getUnknownFields().writeTo(output);
}
-
+
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
if (size != -1) return size;
-
+
size = 0;
for (org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata
element : getAttachmentList()) {
size += com.google.protobuf.CodedOutputStream
@@ -79,7 +98,7 @@ public final class AttachmentProto {
memoizedSerializedSize = size;
return size;
}
-
+
public static
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -146,31 +165,31 @@ public final class AttachmentProto {
return newBuilder().mergeFrom(input, extensionRegistry)
.buildParsed();
}
-
+
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
public static Builder
newBuilder(org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse
prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
-
+
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder> {
private
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse result;
-
+
// Construct using
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse.newBuilder()
private Builder() {}
-
+
private static Builder create() {
Builder builder = new Builder();
builder.result = new
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse();
return builder;
}
-
+
protected
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse
internalGetResult() {
return result;
}
-
+
public Builder clear() {
if (result == null) {
throw new IllegalStateException(
@@ -179,20 +198,20 @@ public final class AttachmentProto {
result = new
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse();
return this;
}
-
+
public Builder clone() {
return create().mergeFrom(result);
}
-
+
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse.getDescriptor();
}
-
+
public
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse
getDefaultInstanceForType() {
return
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse.getDefaultInstance();
}
-
+
public boolean isInitialized() {
return result.isInitialized();
}
@@ -202,7 +221,7 @@ public final class AttachmentProto {
}
return buildPartial();
}
-
+
private
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse
buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
if (!isInitialized()) {
@@ -211,7 +230,7 @@ public final class AttachmentProto {
}
return buildPartial();
}
-
+
public
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse
buildPartial() {
if (result == null) {
throw new IllegalStateException(
@@ -225,7 +244,7 @@ public final class AttachmentProto {
result = null;
return returnMe;
}
-
+
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse) {
return
mergeFrom((org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse)other);
@@ -234,7 +253,7 @@ public final class AttachmentProto {
return this;
}
}
-
+
public Builder
mergeFrom(org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse
other) {
if (other ==
org.waveprotocol.box.attachment.AttachmentProto.AttachmentsResponse.getDefaultInstance())
return this;
if (!other.attachment_.isEmpty()) {
@@ -246,7 +265,7 @@ public final class AttachmentProto {
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
-
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -277,8 +296,8 @@ public final class AttachmentProto {
}
}
}
-
-
+
+
// repeated .attachment.AttachmentMetadata attachment = 1;
public
java.util.List<org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata>
getAttachmentList() {
return java.util.Collections.unmodifiableList(result.attachment_);
@@ -329,19 +348,19 @@ public final class AttachmentProto {
result.attachment_ = java.util.Collections.emptyList();
return this;
}
-
+
// @@protoc_insertion_point(builder_scope:attachment.AttachmentsResponse)
}
-
+
static {
defaultInstance = new AttachmentsResponse(true);
org.waveprotocol.box.attachment.AttachmentProto.internalForceInit();
defaultInstance.initFields();
}
-
+
// @@protoc_insertion_point(class_scope:attachment.AttachmentsResponse)
}
-
+
public static final class AttachmentMetadata extends
com.google.protobuf.GeneratedMessage {
// Use AttachmentMetadata.newBuilder() to construct.
@@ -349,103 +368,103 @@ public final class AttachmentProto {
initFields();
}
private AttachmentMetadata(boolean noInit) {}
-
+
private static final AttachmentMetadata defaultInstance;
public static AttachmentMetadata getDefaultInstance() {
return defaultInstance;
}
-
+
public AttachmentMetadata getDefaultInstanceForType() {
return defaultInstance;
}
-
+
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return
org.waveprotocol.box.attachment.AttachmentProto.internal_static_attachment_AttachmentMetadata_descriptor;
}
-
+
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return
org.waveprotocol.box.attachment.AttachmentProto.internal_static_attachment_AttachmentMetadata_fieldAccessorTable;
}
-
+
// required string attachmentId = 1;
public static final int ATTACHMENTID_FIELD_NUMBER = 1;
private boolean hasAttachmentId;
private java.lang.String attachmentId_ = "";
public boolean hasAttachmentId() { return hasAttachmentId; }
public java.lang.String getAttachmentId() { return attachmentId_; }
-
+
// required string waveRef = 2;
public static final int WAVEREF_FIELD_NUMBER = 2;
private boolean hasWaveRef;
private java.lang.String waveRef_ = "";
public boolean hasWaveRef() { return hasWaveRef; }
public java.lang.String getWaveRef() { return waveRef_; }
-
+
// required string fileName = 3;
public static final int FILENAME_FIELD_NUMBER = 3;
private boolean hasFileName;
private java.lang.String fileName_ = "";
public boolean hasFileName() { return hasFileName; }
public java.lang.String getFileName() { return fileName_; }
-
+
// required string mimeType = 4;
public static final int MIMETYPE_FIELD_NUMBER = 4;
private boolean hasMimeType;
private java.lang.String mimeType_ = "";
public boolean hasMimeType() { return hasMimeType; }
public java.lang.String getMimeType() { return mimeType_; }
-
+
// required int64 size = 5;
public static final int SIZE_FIELD_NUMBER = 5;
private boolean hasSize;
private long size_ = 0L;
public boolean hasSize() { return hasSize; }
public long getSize() { return size_; }
-
+
// required string creator = 6;
public static final int CREATOR_FIELD_NUMBER = 6;
private boolean hasCreator;
private java.lang.String creator_ = "";
public boolean hasCreator() { return hasCreator; }
public java.lang.String getCreator() { return creator_; }
-
+
// required string attachmentUrl = 7;
public static final int ATTACHMENTURL_FIELD_NUMBER = 7;
private boolean hasAttachmentUrl;
private java.lang.String attachmentUrl_ = "";
public boolean hasAttachmentUrl() { return hasAttachmentUrl; }
public java.lang.String getAttachmentUrl() { return attachmentUrl_; }
-
+
// required string thumbnailUrl = 8;
public static final int THUMBNAILURL_FIELD_NUMBER = 8;
private boolean hasThumbnailUrl;
private java.lang.String thumbnailUrl_ = "";
public boolean hasThumbnailUrl() { return hasThumbnailUrl; }
public java.lang.String getThumbnailUrl() { return thumbnailUrl_; }
-
+
// optional .attachment.ImageMetadata imageMetadata = 9;
public static final int IMAGEMETADATA_FIELD_NUMBER = 9;
private boolean hasImageMetadata;
private org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata
imageMetadata_;
public boolean hasImageMetadata() { return hasImageMetadata; }
public org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata
getImageMetadata() { return imageMetadata_; }
-
+
// optional .attachment.ImageMetadata thumbnailMetadata = 10;
public static final int THUMBNAILMETADATA_FIELD_NUMBER = 10;
private boolean hasThumbnailMetadata;
private org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata
thumbnailMetadata_;
public boolean hasThumbnailMetadata() { return hasThumbnailMetadata; }
public org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata
getThumbnailMetadata() { return thumbnailMetadata_; }
-
+
// optional bool malware = 11;
public static final int MALWARE_FIELD_NUMBER = 11;
private boolean hasMalware;
private boolean malware_ = false;
public boolean hasMalware() { return hasMalware; }
public boolean getMalware() { return malware_; }
-
+
private void initFields() {
imageMetadata_ =
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata.getDefaultInstance();
thumbnailMetadata_ =
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata.getDefaultInstance();
@@ -467,7 +486,7 @@ public final class AttachmentProto {
}
return true;
}
-
+
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
@@ -506,12 +525,12 @@ public final class AttachmentProto {
}
getUnknownFields().writeTo(output);
}
-
+
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
if (size != -1) return size;
-
+
size = 0;
if (hasAttachmentId()) {
size += com.google.protobuf.CodedOutputStream
@@ -561,7 +580,7 @@ public final class AttachmentProto {
memoizedSerializedSize = size;
return size;
}
-
+
public static
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -628,31 +647,31 @@ public final class AttachmentProto {
return newBuilder().mergeFrom(input, extensionRegistry)
.buildParsed();
}
-
+
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
public static Builder
newBuilder(org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata
prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
-
+
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder> {
private
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata result;
-
+
// Construct using
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata.newBuilder()
private Builder() {}
-
+
private static Builder create() {
Builder builder = new Builder();
builder.result = new
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata();
return builder;
}
-
+
protected
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata
internalGetResult() {
return result;
}
-
+
public Builder clear() {
if (result == null) {
throw new IllegalStateException(
@@ -661,20 +680,20 @@ public final class AttachmentProto {
result = new
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata();
return this;
}
-
+
public Builder clone() {
return create().mergeFrom(result);
}
-
+
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata.getDescriptor();
}
-
+
public
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata
getDefaultInstanceForType() {
return
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata.getDefaultInstance();
}
-
+
public boolean isInitialized() {
return result.isInitialized();
}
@@ -684,7 +703,7 @@ public final class AttachmentProto {
}
return buildPartial();
}
-
+
private
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
if (!isInitialized()) {
@@ -693,7 +712,7 @@ public final class AttachmentProto {
}
return buildPartial();
}
-
+
public
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata
buildPartial() {
if (result == null) {
throw new IllegalStateException(
@@ -703,7 +722,7 @@ public final class AttachmentProto {
result = null;
return returnMe;
}
-
+
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata) {
return
mergeFrom((org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata)other);
@@ -712,7 +731,7 @@ public final class AttachmentProto {
return this;
}
}
-
+
public Builder
mergeFrom(org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata
other) {
if (other ==
org.waveprotocol.box.attachment.AttachmentProto.AttachmentMetadata.getDefaultInstance())
return this;
if (other.hasAttachmentId()) {
@@ -751,7 +770,7 @@ public final class AttachmentProto {
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
-
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -830,8 +849,8 @@ public final class AttachmentProto {
}
}
}
-
-
+
+
// required string attachmentId = 1;
public boolean hasAttachmentId() {
return result.hasAttachmentId();
@@ -852,7 +871,7 @@ public final class AttachmentProto {
result.attachmentId_ = getDefaultInstance().getAttachmentId();
return this;
}
-
+
// required string waveRef = 2;
public boolean hasWaveRef() {
return result.hasWaveRef();
@@ -873,7 +892,7 @@ public final class AttachmentProto {
result.waveRef_ = getDefaultInstance().getWaveRef();
return this;
}
-
+
// required string fileName = 3;
public boolean hasFileName() {
return result.hasFileName();
@@ -894,7 +913,7 @@ public final class AttachmentProto {
result.fileName_ = getDefaultInstance().getFileName();
return this;
}
-
+
// required string mimeType = 4;
public boolean hasMimeType() {
return result.hasMimeType();
@@ -915,7 +934,7 @@ public final class AttachmentProto {
result.mimeType_ = getDefaultInstance().getMimeType();
return this;
}
-
+
// required int64 size = 5;
public boolean hasSize() {
return result.hasSize();
@@ -933,7 +952,7 @@ public final class AttachmentProto {
result.size_ = 0L;
return this;
}
-
+
// required string creator = 6;
public boolean hasCreator() {
return result.hasCreator();
@@ -954,7 +973,7 @@ public final class AttachmentProto {
result.creator_ = getDefaultInstance().getCreator();
return this;
}
-
+
// required string attachmentUrl = 7;
public boolean hasAttachmentUrl() {
return result.hasAttachmentUrl();
@@ -975,7 +994,7 @@ public final class AttachmentProto {
result.attachmentUrl_ = getDefaultInstance().getAttachmentUrl();
return this;
}
-
+
// required string thumbnailUrl = 8;
public boolean hasThumbnailUrl() {
return result.hasThumbnailUrl();
@@ -996,7 +1015,7 @@ public final class AttachmentProto {
result.thumbnailUrl_ = getDefaultInstance().getThumbnailUrl();
return this;
}
-
+
// optional .attachment.ImageMetadata imageMetadata = 9;
public boolean hasImageMetadata() {
return result.hasImageMetadata();
@@ -1033,7 +1052,7 @@ public final class AttachmentProto {
result.imageMetadata_ =
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata.getDefaultInstance();
return this;
}
-
+
// optional .attachment.ImageMetadata thumbnailMetadata = 10;
public boolean hasThumbnailMetadata() {
return result.hasThumbnailMetadata();
@@ -1070,7 +1089,7 @@ public final class AttachmentProto {
result.thumbnailMetadata_ =
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata.getDefaultInstance();
return this;
}
-
+
// optional bool malware = 11;
public boolean hasMalware() {
return result.hasMalware();
@@ -1088,19 +1107,19 @@ public final class AttachmentProto {
result.malware_ = false;
return this;
}
-
+
// @@protoc_insertion_point(builder_scope:attachment.AttachmentMetadata)
}
-
+
static {
defaultInstance = new AttachmentMetadata(true);
org.waveprotocol.box.attachment.AttachmentProto.internalForceInit();
defaultInstance.initFields();
}
-
+
// @@protoc_insertion_point(class_scope:attachment.AttachmentMetadata)
}
-
+
public static final class ImageMetadata extends
com.google.protobuf.GeneratedMessage {
// Use ImageMetadata.newBuilder() to construct.
@@ -1108,40 +1127,40 @@ public final class AttachmentProto {
initFields();
}
private ImageMetadata(boolean noInit) {}
-
+
private static final ImageMetadata defaultInstance;
public static ImageMetadata getDefaultInstance() {
return defaultInstance;
}
-
+
public ImageMetadata getDefaultInstanceForType() {
return defaultInstance;
}
-
+
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return
org.waveprotocol.box.attachment.AttachmentProto.internal_static_attachment_ImageMetadata_descriptor;
}
-
+
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return
org.waveprotocol.box.attachment.AttachmentProto.internal_static_attachment_ImageMetadata_fieldAccessorTable;
}
-
+
// required int32 width = 1;
public static final int WIDTH_FIELD_NUMBER = 1;
private boolean hasWidth;
private int width_ = 0;
public boolean hasWidth() { return hasWidth; }
public int getWidth() { return width_; }
-
+
// required int32 height = 2;
public static final int HEIGHT_FIELD_NUMBER = 2;
private boolean hasHeight;
private int height_ = 0;
public boolean hasHeight() { return hasHeight; }
public int getHeight() { return height_; }
-
+
private void initFields() {
}
public final boolean isInitialized() {
@@ -1149,7 +1168,7 @@ public final class AttachmentProto {
if (!hasHeight) return false;
return true;
}
-
+
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
@@ -1161,12 +1180,12 @@ public final class AttachmentProto {
}
getUnknownFields().writeTo(output);
}
-
+
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
if (size != -1) return size;
-
+
size = 0;
if (hasWidth()) {
size += com.google.protobuf.CodedOutputStream
@@ -1180,7 +1199,7 @@ public final class AttachmentProto {
memoizedSerializedSize = size;
return size;
}
-
+
public static
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1247,31 +1266,31 @@ public final class AttachmentProto {
return newBuilder().mergeFrom(input, extensionRegistry)
.buildParsed();
}
-
+
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
public static Builder
newBuilder(org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata
prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
-
+
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder> {
private org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata
result;
-
+
// Construct using
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata.newBuilder()
private Builder() {}
-
+
private static Builder create() {
Builder builder = new Builder();
builder.result = new
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata();
return builder;
}
-
+
protected org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata
internalGetResult() {
return result;
}
-
+
public Builder clear() {
if (result == null) {
throw new IllegalStateException(
@@ -1280,20 +1299,20 @@ public final class AttachmentProto {
result = new
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata();
return this;
}
-
+
public Builder clone() {
return create().mergeFrom(result);
}
-
+
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata.getDescriptor();
}
-
+
public org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata
getDefaultInstanceForType() {
return
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata.getDefaultInstance();
}
-
+
public boolean isInitialized() {
return result.isInitialized();
}
@@ -1303,7 +1322,7 @@ public final class AttachmentProto {
}
return buildPartial();
}
-
+
private org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata
buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
if (!isInitialized()) {
@@ -1312,7 +1331,7 @@ public final class AttachmentProto {
}
return buildPartial();
}
-
+
public org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata
buildPartial() {
if (result == null) {
throw new IllegalStateException(
@@ -1322,7 +1341,7 @@ public final class AttachmentProto {
result = null;
return returnMe;
}
-
+
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata) {
return
mergeFrom((org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata)other);
@@ -1331,7 +1350,7 @@ public final class AttachmentProto {
return this;
}
}
-
+
public Builder
mergeFrom(org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata other) {
if (other ==
org.waveprotocol.box.attachment.AttachmentProto.ImageMetadata.getDefaultInstance())
return this;
if (other.hasWidth()) {
@@ -1343,7 +1362,7 @@ public final class AttachmentProto {
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
-
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1376,8 +1395,8 @@ public final class AttachmentProto {
}
}
}
-
-
+
+
// required int32 width = 1;
public boolean hasWidth() {
return result.hasWidth();
@@ -1395,7 +1414,7 @@ public final class AttachmentProto {
result.width_ = 0;
return this;
}
-
+
// required int32 height = 2;
public boolean hasHeight() {
return result.hasHeight();
@@ -1413,19 +1432,19 @@ public final class AttachmentProto {
result.height_ = 0;
return this;
}
-
+
// @@protoc_insertion_point(builder_scope:attachment.ImageMetadata)
}
-
+
static {
defaultInstance = new ImageMetadata(true);
org.waveprotocol.box.attachment.AttachmentProto.internalForceInit();
defaultInstance.initFields();
}
-
+
// @@protoc_insertion_point(class_scope:attachment.ImageMetadata)
}
-
+
private static com.google.protobuf.Descriptors.Descriptor
internal_static_attachment_AttachmentsResponse_descriptor;
private static
@@ -1441,7 +1460,7 @@ public final class AttachmentProto {
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_attachment_ImageMetadata_fieldAccessorTable;
-
+
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
return descriptor;
@@ -1502,8 +1521,8 @@ public final class AttachmentProto {
new com.google.protobuf.Descriptors.FileDescriptor[] {
}, assigner);
}
-
+
public static void internalForceInit() {}
-
+
// @@protoc_insertion_point(outer_class_scope)
}
