diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 11:01:32 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 11:01:32 -0800 |
commit | 643d09ac7dcbf3b014a8a0465ebc4405ac8388b7 (patch) | |
tree | 67abff5f87181bf73ae4b7588028647d6126a7d7 /java/src | |
parent | 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e (diff) | |
parent | c76807211af6ae86368bcd7651ca707ee7f12f86 (diff) | |
download | protobuf-643d09ac7dcbf3b014a8a0465ebc4405ac8388b7.tar.gz protobuf-643d09ac7dcbf3b014a8a0465ebc4405ac8388b7.tar.bz2 protobuf-643d09ac7dcbf3b014a8a0465ebc4405ac8388b7.zip |
Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo
Conflicts:
src/google/protobuf/compiler/java/java_file.cc
Diffstat (limited to 'java/src')
4 files changed, 7 insertions, 7 deletions
diff --git a/java/src/main/java/com/google/protobuf/DynamicMessage.java b/java/src/main/java/com/google/protobuf/DynamicMessage.java index 06b30fff..9c5e6c61 100644 --- a/java/src/main/java/com/google/protobuf/DynamicMessage.java +++ b/java/src/main/java/com/google/protobuf/DynamicMessage.java @@ -59,7 +59,7 @@ public final class DynamicMessage extends AbstractMessage { * oneofCases stores the FieldDescriptor for each oneof to indicate * which field is set. Caller should make sure the array is immutable. * - * This contructor is package private and will be used in + * This constructor is package private and will be used in * {@code DynamicMutableMessage} to convert a mutable message to an immutable * message. */ diff --git a/java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java b/java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java index 63535ac8..be737b1a 100644 --- a/java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java +++ b/java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java @@ -54,7 +54,7 @@ import java.util.List; * that desires a Message instead of a Builder. In terms of the implementation, * the {@code SingleFieldBuilder} and {@code RepeatedFieldBuilder} * classes cache messages that were created so that messages only need to be - * created when some change occured in its builder or a builder for one of its + * created when some change occurred in its builder or a builder for one of its * descendants. * * @param <MType> the type of message for the field diff --git a/java/src/main/java/com/google/protobuf/SingleFieldBuilder.java b/java/src/main/java/com/google/protobuf/SingleFieldBuilder.java index 13a36d47..aba65e32 100644 --- a/java/src/main/java/com/google/protobuf/SingleFieldBuilder.java +++ b/java/src/main/java/com/google/protobuf/SingleFieldBuilder.java @@ -47,7 +47,7 @@ package com.google.protobuf; * that desires a Message instead of a Builder. In terms of the implementation, * the {@code SingleFieldBuilder} and {@code RepeatedFieldBuilder} * classes cache messages that were created so that messages only need to be - * created when some change occured in its builder or a builder for one of its + * created when some change occurred in its builder or a builder for one of its * descendants. * * @param <MType> the type of message for the field diff --git a/java/src/main/java/com/google/protobuf/TextFormat.java b/java/src/main/java/com/google/protobuf/TextFormat.java index 44674811..63e62fc6 100644 --- a/java/src/main/java/com/google/protobuf/TextFormat.java +++ b/java/src/main/java/com/google/protobuf/TextFormat.java @@ -1387,7 +1387,7 @@ public final class TextFormat { // Try to guess the type of this field. // If this field is not a message, there should be a ":" between the // field name and the field value and also the field value should not - // start with "{" or "<" which indicates the begining of a message body. + // start with "{" or "<" which indicates the beginning of a message body. // If there is no ":" or there is a "{" or "<" after ":", this field has // to be a message or the input is ill-formed. if (tokenizer.tryConsume(":") && !tokenizer.lookingAt("{") && @@ -1574,7 +1574,7 @@ public final class TextFormat { // Try to guess the type of this field. // If this field is not a message, there should be a ":" between the // field name and the field value and also the field value should not - // start with "{" or "<" which indicates the begining of a message body. + // start with "{" or "<" which indicates the beginning of a message body. // If there is no ":" or there is a "{" or "<" after ":", this field has // to be a message or the input is ill-formed. if (tokenizer.tryConsume(":") && !tokenizer.lookingAt("<") && @@ -1591,8 +1591,8 @@ public final class TextFormat { } /** - * Skips the whole body of a message including the beginning delimeter and - * the ending delimeter. + * Skips the whole body of a message including the beginning delimiter and + * the ending delimiter. */ private void skipFieldMessage(Tokenizer tokenizer) throws ParseException { final String delimiter; |