Revision: 6443 Author: [email protected] Date: Wed Oct 21 18:05:58 2009 Log: Updates to use the rebased protobuf library. References to com.google.protobuf in RemoteMessageProto.java and ViewerServiceClient.java have been updated. Also updated licensing information to indicate that modifications to the library were made.
Review by: mmendez (TBR) http://code.google.com/p/google-web-toolkit/source/detail?r=6443 Modified: /trunk/dev/build.xml /trunk/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java /trunk/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java /trunk/distro-source/core/src/COPYING /trunk/distro-source/core/src/COPYING.html /trunk/distro-source/core/src/about.html /trunk/distro-source/core/src/about.txt /trunk/eclipse/dev/.classpath ======================================= --- /trunk/dev/build.xml Tue Oct 20 22:03:27 2009 +++ /trunk/dev/build.xml Wed Oct 21 18:05:58 2009 @@ -38,7 +38,7 @@ <include name="apache/ant-1.6.5.jar" /> <include name="eclipse/jdt-3.4.2.jar" /> <include name="jetty/jetty-6.1.11.jar" /> - <include name="protobuf/protobuf-2.2.0/protobuf-java-2.2.0.jar" /> + <include name="protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar" /> <include name="tomcat/ant-launcher-1.6.5.jar" /> <include name="tomcat/catalina-1.0.jar" /> <include name="tomcat/catalina-optional-1.0.jar" /> @@ -94,7 +94,7 @@ <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" /> <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" /> <zipfileset src="${gwt.tools.lib}/jetty/jetty-6.1.11.jar" /> - <zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.2.0/protobuf-java-2.2.0.jar" /> + <zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar" /> <zipfileset src="${gwt.tools.lib}/tomcat/ant-launcher-1.6.5.jar" /> <zipfileset src="${gwt.tools.lib}/tomcat/catalina-1.0.jar" /> <zipfileset src="${gwt.tools.lib}/tomcat/catalina-optional-1.0.jar" /> ======================================= --- /trunk/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java Tue Oct 20 19:33:54 2009 +++ /trunk/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java Wed Oct 21 18:05:58 2009 @@ -1,484 +1,1286 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! + +// This file was hand-edited to rebase the com.google.protobuf package +// to com.google.gwt.dev.protobuf package com.google.gwt.dev.shell.remoteui; public final class RemoteMessageProto { - private RemoteMessageProto() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - } public static final class Message extends - com.google.protobuf.GeneratedMessage { - // Use Message.newBuilder() to construct. - private Message() {} - - private static final Message defaultInstance = new Message(); - public static Message getDefaultInstance() { - return defaultInstance; - } - - public Message getDefaultInstanceForType() { - return defaultInstance; - } - - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_fieldAccessorTable; - } - - public enum MessageType - implements com.google.protobuf.ProtocolMessageEnum { - REQUEST(0, 0), - RESPONSE(1, 1), - ; - - - public final int getNumber() { return value; } - - public static MessageType valueOf(int value) { - switch (value) { - case 0: return REQUEST; - case 1: return RESPONSE; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap<MessageType> - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap<MessageType> - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap<MessageType>() { - public MessageType findValueByNumber(int number) { - return MessageType.valueOf(number) - ; } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.getDescriptor().getEnumTypes().get(0); - } - - private static final MessageType[] VALUES = { - REQUEST, RESPONSE, + com.google.gwt.dev.protobuf.GeneratedMessage { + public static final class Builder extends + com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder> { + private static Builder create() { + Builder builder = new Builder(); + builder.result = new com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message(); + return builder; + } + + private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message result; + + // Construct using + // com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.newBuilder() + private Builder() { + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message build() { + if (result != null && !isInitialized()) { + throw newUninitializedMessageException(result); + } + return buildPartial(); + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message buildPartial() { + if (result == null) { + throw new IllegalStateException( + "build() has already been called on this Builder."); + } + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message returnMe = result; + result = null; + return returnMe; + } + + public Builder clear() { + if (result == null) { + throw new IllegalStateException("Cannot call clear() after build()."); + } + result = new com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message(); + return this; + } + + public Builder clearMessageType() { + result.hasMessageType = false; + result.messageType_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.MessageType.REQUEST; + return this; + } + + public Builder clearRequest() { + result.hasRequest = false; + result.request_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.getDefaultInstance(); + return this; + } + + public Builder clearResponse() { + result.hasResponse = false; + result.response_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.getDefaultInstance(); + return this; + } + + public Builder clone() { + return create().mergeFrom(result); + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message getDefaultInstanceForType() { + return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.getDefaultInstance(); + } + + public com.google.gwt.dev.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.getDescriptor(); + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.MessageType getMessageType() { + return result.getMessageType(); + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request getRequest() { + return result.getRequest(); + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response getResponse() { + return result.getResponse(); + } + + // required .com.google.gwt.dev.shell.remoteui.Message.MessageType + // messageType = 1; + public boolean hasMessageType() { + return result.hasMessageType(); + } + + // optional .com.google.gwt.dev.shell.remoteui.Message.Request request = + // 2; + public boolean hasRequest() { + return result.hasRequest(); + } + + // optional .com.google.gwt.dev.shell.remoteui.Message.Response response = + // 3; + public boolean hasResponse() { + return result.hasResponse(); + } + + public boolean isInitialized() { + return result.isInitialized(); + } + + public Builder mergeFrom( + com.google.gwt.dev.protobuf.CodedInputStream input, + com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder(this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + return this; + default: { + if (!parseUnknownField(input, unknownFields, extensionRegistry, + tag)) { + this.setUnknownFields(unknownFields.build()); + return this; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.MessageType value = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.MessageType.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + setMessageType(value); + } + break; + } + case 18: { + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.Builder subBuilder = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.newBuilder(); + if (hasRequest()) { + subBuilder.mergeFrom(getRequest()); + } + input.readMessage(subBuilder, extensionRegistry); + setRequest(subBuilder.buildPartial()); + break; + } + case 26: { + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.Builder subBuilder = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.newBuilder(); + if (hasResponse()) { + subBuilder.mergeFrom(getResponse()); + } + input.readMessage(subBuilder, extensionRegistry); + setResponse(subBuilder.buildPartial()); + break; + } + } + } + } + + public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) { + if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message) { + return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message other) { + if (other == com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.getDefaultInstance()) + return this; + if (other.hasMessageType()) { + setMessageType(other.getMessageType()); + } + if (other.hasRequest()) { + mergeRequest(other.getRequest()); + } + if (other.hasResponse()) { + mergeResponse(other.getResponse()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public Builder mergeRequest( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request value) { + if (result.hasRequest() + && result.request_ != com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.getDefaultInstance()) { + result.request_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.newBuilder( + result.request_).mergeFrom(value).buildPartial(); + } else { + result.request_ = value; + } + result.hasRequest = true; + return this; + } + + public Builder mergeResponse( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response value) { + if (result.hasResponse() + && result.response_ != com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.getDefaultInstance()) { + result.response_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.newBuilder( + result.response_).mergeFrom(value).buildPartial(); + } else { + result.response_ = value; + } + result.hasResponse = true; + return this; + } + + public Builder setMessageType( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.MessageType value) { + if (value == null) { + throw new NullPointerException(); + } + result.hasMessageType = true; + result.messageType_ = value; + return this; + } + + public Builder setRequest( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request value) { + if (value == null) { + throw new NullPointerException(); + } + result.hasRequest = true; + result.request_ = value; + return this; + } + + public Builder setRequest( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.Builder builderForValue) { + result.hasRequest = true; + result.request_ = builderForValue.build(); + return this; + } + + public Builder setResponse( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response value) { + if (value == null) { + throw new NullPointerException(); + } + result.hasResponse = true; + result.response_ = value; + return this; + } + + public Builder setResponse( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.Builder builderForValue) { + result.hasResponse = true; + result.response_ = builderForValue.build(); + return this; + } + + protected com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message internalGetResult() { + return result; + } + + private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message buildParsed() + throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException { + if (!isInitialized()) { + throw newUninitializedMessageException(result).asInvalidProtocolBufferException(); + } + return buildPartial(); + } + } + + public enum MessageType implements + com.google.gwt.dev.protobuf.ProtocolMessageEnum { + REQUEST(0, 0), RESPONSE(1, 1), ; + + private static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<MessageType> internalValueMap = new com.google.gwt.dev.protobuf.Internal.EnumLiteMap<MessageType>() { + public MessageType findValueByNumber(int number) { + return MessageType.valueOf(number); + } }; + + private static final MessageType[] VALUES = {REQUEST, RESPONSE,}; + + public static final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor getDescriptor() { + return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.getDescriptor().getEnumTypes().get( + 0); + } + + public static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<MessageType> internalGetValueMap() { + return internalValueMap; + } + public static MessageType valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); + "EnumValueDescriptor is not for this type."); } return VALUES[desc.getIndex()]; } + + public static MessageType valueOf(int value) { + switch (value) { + case 0: + return REQUEST; + case 1: + return RESPONSE; + default: + return null; + } + } + private final int index; + private final int value; + static { + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.getDescriptor(); + } + private MessageType(int index, int value) { this.index = index; this.value = value; } - - static { - com.google.gwt.dev.shell.remoteui.RemoteMessageProto.getDescriptor(); - } - } - - public static final class Request extends - com.google.protobuf.GeneratedMessage { - // Use Request.newBuilder() to construct. - private Request() {} - - private static final Request defaultInstance = new Request(); - public static Request getDefaultInstance() { - return defaultInstance; - } - - public Request getDefaultInstanceForType() { - return defaultInstance; - } - - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_fieldAccessorTable; - } - - public enum ServiceType - implements com.google.protobuf.ProtocolMessageEnum { - VIEWER(0, 0), - DEV_MODE(1, 1), - ; - - - public final int getNumber() { return value; } - - public static ServiceType valueOf(int value) { - switch (value) { - case 0: return VIEWER; - case 1: return DEV_MODE; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap<ServiceType> - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap<ServiceType> - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap<ServiceType>() { - public ServiceType findValueByNumber(int number) { - return ServiceType.valueOf(number) - ; } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.getDescriptor().getEnumTypes().get(0); - } - - private static final ServiceType[] VALUES = { - VIEWER, DEV_MODE, - }; - public static ServiceType valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - private final int index; - private final int value; - private ServiceType(int index, int value) { - this.index = index; - this.value = value; - } - - static { - com.google.gwt.dev.shell.remoteui.RemoteMessageProto.getDescriptor(); - } - } - - public static final class ViewerRequest extends - com.google.protobuf.GeneratedMessage { - // Use ViewerRequest.newBuilder() to construct. - private ViewerRequest() {} - - private static final ViewerRequest defaultInstance = new ViewerRequest(); - public static ViewerRequest getDefaultInstance() { - return defaultInstance; - } - - public ViewerRequest getDefaultInstanceForType() { - return defaultInstance; - } - - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_fieldAccessorTable; - } - - public enum RequestType - implements com.google.protobuf.ProtocolMessageEnum { - CAPABILITY_EXCHANGE(0, 0), - ADD_LOG(1, 1), - ADD_LOG_BRANCH(2, 2), - ADD_LOG_ENTRY(3, 3), - DISCONNECT_LOG(4, 4), - ; - - - public final int getNumber() { return value; } - - public static RequestType valueOf(int value) { - switch (value) { - case 0: return CAPABILITY_EXCHANGE; - case 1: return ADD_LOG; - case 2: return ADD_LOG_BRANCH; - case 3: return ADD_LOG_ENTRY; - case 4: return DISCONNECT_LOG; - default: return null; + + public final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { + return getDescriptor(); + } + + public final int getNumber() { + return value; + } + + public final com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + } + public static final class Request extends + com.google.gwt.dev.protobuf.GeneratedMessage { + public static final class Builder extends + com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder> { + private static Builder create() { + Builder builder = new Builder(); + builder.result = new com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request(); + return builder; + } + + private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request result; + + // Construct using + // com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.newBuilder() + private Builder() { + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request build() { + if (result != null && !isInitialized()) { + throw newUninitializedMessageException(result); + } + return buildPartial(); + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request buildPartial() { + if (result == null) { + throw new IllegalStateException( + "build() has already been called on this Builder."); + } + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request returnMe = result; + result = null; + return returnMe; + } + + public Builder clear() { + if (result == null) { + throw new IllegalStateException( + "Cannot call clear() after build()."); + } + result = new com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request(); + return this; + } + + public Builder clearDevModeRequest() { + result.hasDevModeRequest = false; + result.devModeRequest_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.getDefaultInstance(); + return this; + } + + public Builder clearRequestId() { + result.hasRequestId = false; + result.requestId_ = 0; + return this; + } + + public Builder clearServiceType() { + result.hasServiceType = false; + result.serviceType_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ServiceType.VIEWER; + return this; + } + + public Builder clearViewerRequest() { + result.hasViewerRequest = false; + result.viewerRequest_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.getDefaultInstance(); + return this; + } + + public Builder clone() { + return create().mergeFrom(result); + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request getDefaultInstanceForType() { + return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.getDefaultInstance(); + } + + public com.google.gwt.dev.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.getDescriptor(); + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest getDevModeRequest() { + return result.getDevModeRequest(); + } + + public int getRequestId() { + return result.getRequestId(); + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ServiceType getServiceType() { + return result.getServiceType(); + } + + public com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest getViewerRequest() { + return result.getViewerRequest(); + } + + // optional + // .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest + // devModeRequest = 4; + public boolean hasDevModeRequest() { + return result.hasDevModeRequest(); + } + + // optional uint32 requestId = 2; + public boolean hasRequestId() { + return result.hasRequestId(); + } + + // required + // .com.google.gwt.dev.shell.remoteui.Message.Request.ServiceType + // serviceType = 1; + public boolean hasServiceType() { + return result.hasServiceType(); + } + + // optional + // .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest + // viewerRequest = 3; + public boolean hasViewerRequest() { + return result.hasViewerRequest(); + } + + public boolean isInitialized() { + return result.isInitialized(); + } + + public Builder mergeDevModeRequest( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest value) { + if (result.hasDevModeRequest() + && result.devModeRequest_ != com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.getDefaultInstance()) { + result.devModeRequest_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.newBuilder( + result.devModeRequest_).mergeFrom(value).buildPartial(); + } else { + result.devModeRequest_ = value; + } + result.hasDevModeRequest = true; + return this; + } + + public Builder mergeFrom( + com.google.gwt.dev.protobuf.CodedInputStream input, + com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder(this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + return this; + default: { + if (!parseUnknownField(input, unknownFields, extensionRegistry, + tag)) { + this.setUnknownFields(unknownFields.build()); + return this; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ServiceType value = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ServiceType.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + setServiceType(value); + } + break; + } + case 16: { + setRequestId(input.readUInt32()); + break; + } + case 26: { + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Builder subBuilder = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.newBuilder(); + if (hasViewerRequest()) { + subBuilder.mergeFrom(getViewerRequest()); + } + input.readMessage(subBuilder, extensionRegistry); + setViewerRequest(subBuilder.buildPartial()); + break; + } + case 34: { + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.Builder subBuilder = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.newBuilder(); + if (hasDevModeRequest()) { + subBuilder.mergeFrom(getDevModeRequest()); + } + input.readMessage(subBuilder, extensionRegistry); + setDevModeRequest(subBuilder.buildPartial()); + break; + } } } - - public static com.google.protobuf.Internal.EnumLiteMap<RequestType> - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap<RequestType> - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap<RequestType>() { - public RequestType findValueByNumber(int number) { - return RequestType.valueOf(number) - ; } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.getDescriptor().getEnumTypes().get(0); - } - - private static final RequestType[] VALUES = { - CAPABILITY_EXCHANGE, ADD_LOG, ADD_LOG_BRANCH, ADD_LOG_ENTRY, DISCONNECT_LOG, - }; - public static RequestType valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - private final int index; - private final int value; - private RequestType(int index, int value) { - this.index = index; - this.value = value; - } - - static { - com.google.gwt.dev.shell.remoteui.RemoteMessageProto.getDescriptor(); - } - } - - public static final class CapabilityExchange extends - com.google.protobuf.GeneratedMessage { - // Use CapabilityExchange.newBuilder() to construct. - private CapabilityExchange() {} - - private static final CapabilityExchange defaultInstance = new CapabilityExchange(); - public static CapabilityExchange getDefaultInstance() { - return defaultInstance; - } - - public CapabilityExchange getDefaultInstanceForType() { - return defaultInstance; - } - - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_fieldAccessorTable; - } - - public final boolean isInitialized() { - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data).buildParsed(); - } - public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data, extensionRegistry) - .buildParsed(); - } - public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data).buildParsed(); - } - public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data, extensionRegistry) - .buildParsed(); - } - public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom(java.io.InputStream input) - throws java.io.IOException { - return newBuilder().mergeFrom(input).buildParsed(); - } - public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return newBuilder().mergeFrom(input, extensionRegistry) - .buildParsed(); - } - public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return newBuilder().mergeDelimitedFrom(input).buildParsed(); - } - public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return newBuilder().mergeDelimitedFrom(input, extensionRegistry) - .buildParsed(); - } - public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return newBuilder().mergeFrom(input).buildParsed(); - } - public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) + } + + public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) { + if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request) { + return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request other) { + if (other == com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.getDefaultInstance()) + return this; + if (other.hasServiceType()) { + setServiceType(other.getServiceType()); + } + if (other.hasRequestId()) { + setRequestId(other.getRequestId()); + } + if (other.hasViewerRequest()) { + mergeViewerRequest(other.getViewerRequest()); + } + if (other.hasDevModeRequest()) { + mergeDevModeRequest(other.getDevModeRequest()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public Builder mergeViewerRequest( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest value) { + if (result.hasViewerRequest() + && result.viewerRequest_ != com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.getDefaultInstance()) { + result.viewerRequest_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.newBuilder( + result.viewerRequest_).mergeFrom(value).buildPartial(); + } else { + result.viewerRequest_ = value; + } + result.hasViewerRequest = true; + return this; + } + + public Builder setDevModeRequest( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest value) { + if (value == null) { + throw new NullPointerException(); + } + result.hasDevModeRequest = true; + result.devModeRequest_ = value; + return this; + } + + public Builder setDevModeRequest( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.Builder builderForValue) { + result.hasDevModeRequest = true; + result.devModeRequest_ = builderForValue.build(); + return this; + } + + public Builder setRequestId(int value) { + result.hasRequestId = true; + result.requestId_ = value; + return this; + } + + public Builder setServiceType( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ServiceType value) { + if (value == null) { + throw new NullPointerException(); + } + result.hasServiceType = true; + result.serviceType_ = value; + return this; + } + + public Builder setViewerRequest( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest value) { + if (value == null) { + throw new NullPointerException(); + } + result.hasViewerRequest = true; + result.viewerRequest_ = value; + return this; + } + + public Builder setViewerRequest( + com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Builder builderForValue) { + result.hasViewerRequest = true; + result.viewerRequest_ = builderForValue.build(); + return this; + } + + protected com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request internalGetResult() { + return result; + } + + private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request buildParsed() + throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException { + if (!isInitialized()) { + throw newUninitializedMessageException(result).asInvalidProtocolBufferException(); + } + return buildPartial(); + } + } + + public static final class DevModeRequest extends + com.google.gwt.dev.protobuf.GeneratedMessage { ***The diff for this file has been truncated for email.*** ======================================= --- /trunk/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java Tue Oct 20 19:33:54 2009 +++ /trunk/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java Wed Oct 21 18:05:58 2009 @@ -17,6 +17,7 @@ import com.google.gwt.core.ext.TreeLogger.HelpInfo; import com.google.gwt.core.ext.TreeLogger.Type; +import com.google.gwt.dev.protobuf.ByteString; import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request; import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response; import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest; @@ -25,7 +26,6 @@ import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse; import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability; import com.google.gwt.dev.util.log.AbstractTreeLogger; -import com.google.protobuf.ByteString; import java.util.List; import java.util.concurrent.ExecutionException; ======================================= --- /trunk/distro-source/core/src/COPYING Tue Oct 20 19:33:54 2009 +++ /trunk/distro-source/core/src/COPYING Wed Oct 21 18:05:58 2009 @@ -251,5 +251,6 @@ http://www.opensource.org/licenses/bsd-license.php Source code availablility: http://code.google.com/p/protobuf/source/checkout + Binary modifications consist of package-rebasing. The rebased classes are rooted at com/google/gwt/dev/protobuf/ within gwt-dev.jar ======================================= --- /trunk/distro-source/core/src/COPYING.html Tue Oct 20 19:33:54 2009 +++ /trunk/distro-source/core/src/COPYING.html Wed Oct 21 18:05:58 2009 @@ -336,7 +336,10 @@ <tr> <td class="package">Protobuf</td> <td class="license"><a href="http://www.opensource.org/licenses/bsd-license.php";>New BSD License</a></td> - <td class="location"><a href="http://code.google.com/p/protobuf/source/checkout";>code.google.com/p/protobuf</a></td> + <td class="location"> + <a href="http://code.google.com/p/protobuf/source/checkout";>code.google.com/p/protobuf</a>; + binary modifications consist of package-rebasing. The rebased classes are rooted at com/google/gwt/dev/protobuf/ within gwt-dev.jar + </td> </tr> </tbody></table> ======================================= --- /trunk/distro-source/core/src/about.html Tue Oct 20 19:33:54 2009 +++ /trunk/distro-source/core/src/about.html Wed Oct 21 18:05:58 2009 @@ -95,7 +95,7 @@ <li><a href="http://selenium-rc.openqa.org/";>Selenium-RC</a> </li> </ul> </li> - <li>The <a href="http://code.google.com/p/protobuf/";>Protobuf Project</a></li> + <li>The <a href="http://code.google.com/p/protobuf/";>Protobuf Project</a> (with modifications)</li> </ul> For source availability and license information see COPYING.html. ======================================= --- /trunk/distro-source/core/src/about.txt Tue Oct 20 19:33:54 2009 +++ /trunk/distro-source/core/src/about.txt Wed Oct 21 18:05:58 2009 @@ -20,6 +20,6 @@ - ASM (http://asm.objectweb.org/) with modifications - The OpenQA Project (http://openqa.org/) - Selenium-RC (http://selenium-rc.openqa.org/) - - The Protobuf Project (http://code.google.com/p/protobuf/) + - The Protobuf Project (http://code.google.com/p/protobuf/) with modifications For source availability and license information see COPYING. ======================================= --- /trunk/eclipse/dev/.classpath Tue Oct 20 19:33:54 2009 +++ /trunk/eclipse/dev/.classpath Wed Oct 21 18:05:58 2009 @@ -39,6 +39,6 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/sun/swingworker/swing-worker-1.1.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-core-js-r5070.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-core-js-r5070-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5070.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5070-sources.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.2.0/protobuf-java-2.2.0.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar"/> <classpathentry kind="output" path="bin"/> </classpath> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
