diff options
Diffstat (limited to 'java/core/src')
3 files changed, 21 insertions, 21 deletions
diff --git a/java/core/src/main/java/com/google/protobuf/AbstractMessage.java b/java/core/src/main/java/com/google/protobuf/AbstractMessage.java index b8fdb2b2..46ddbf48 100644 --- a/java/core/src/main/java/com/google/protobuf/AbstractMessage.java +++ b/java/core/src/main/java/com/google/protobuf/AbstractMessage.java @@ -498,7 +498,7 @@ public abstract class AbstractMessage * override this method. */ void markClean() { - throw new IllegalStateException("Should be overriden by subclasses."); + throw new IllegalStateException("Should be overridden by subclasses."); } /** @@ -510,7 +510,7 @@ public abstract class AbstractMessage * override this method. */ void dispose() { - throw new IllegalStateException("Should be overriden by subclasses."); + throw new IllegalStateException("Should be overridden by subclasses."); } // =============================================================== @@ -605,7 +605,7 @@ public abstract class AbstractMessage } /** - * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1 + * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1 * generated code. */ @Deprecated @@ -614,7 +614,7 @@ public abstract class AbstractMessage } // /** - * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1 + * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1 * generated code. */ @Deprecated @@ -623,7 +623,7 @@ public abstract class AbstractMessage } // /** - * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1 + * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1 * generated code. */ @Deprecated @@ -632,7 +632,7 @@ public abstract class AbstractMessage } // /** - * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1 + * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1 * generated code. */ @Deprecated diff --git a/java/core/src/main/java/com/google/protobuf/ByteString.java b/java/core/src/main/java/com/google/protobuf/ByteString.java index 62c94508..49653899 100644 --- a/java/core/src/main/java/com/google/protobuf/ByteString.java +++ b/java/core/src/main/java/com/google/protobuf/ByteString.java @@ -87,17 +87,17 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { * Empty {@code ByteString}. */ public static final ByteString EMPTY = new LiteralByteString(Internal.EMPTY_BYTE_ARRAY); - - /** + + /** * An interface to efficiently copy {@code byte[]}. - * - * <p>One of the noticable costs of copying a byte[] into a new array using - * {@code System.arraycopy} is nullification of a new buffer before the copy. It has been shown + * + * <p>One of the noticeable costs of copying a byte[] into a new array using + * {@code System.arraycopy} is nullification of a new buffer before the copy. It has been shown * the Hotspot VM is capable to intrisicfy {@code Arrays.copyOfRange} operation to avoid this * expensive nullification and provide substantial performance gain. Unfortunately this does not * hold on Android runtimes and could make the copy slightly slower due to additional code in * the {@code Arrays.copyOfRange}. Thus we provide two different implementation for array copier - * for Hotspot and Android runtimes. + * for Hotspot and Android runtimes. */ private interface ByteArrayCopier { /** @@ -105,7 +105,7 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { */ byte[] copyFrom(byte[] bytes, int offset, int size); } - + /** Implementation of {@code ByteArrayCopier} which uses {@link System#arraycopy}. */ private static final class SystemByteArrayCopier implements ByteArrayCopier { @Override @@ -115,7 +115,7 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { return copy; } } - + /** Implementation of {@code ByteArrayCopier} which uses {@link Arrays#copyOfRange}. */ private static final class ArraysByteArrayCopier implements ByteArrayCopier { @Override @@ -123,7 +123,7 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { return Arrays.copyOfRange(bytes, offset, offset + size); } } - + private static final ByteArrayCopier byteArrayCopier; static { boolean isAndroid = true; @@ -132,7 +132,7 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { } catch (ClassNotFoundException e) { isAndroid = false; } - + byteArrayCopier = isAndroid ? new SystemByteArrayCopier() : new ArraysByteArrayCopier(); } @@ -309,7 +309,7 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { public static ByteString copyFrom(byte[] bytes) { return copyFrom(bytes, 0, bytes.length); } - + /** * Wraps the given bytes into a {@code ByteString}. Intended for internal only * usage to force a classload of ByteString before LiteralByteString. @@ -402,7 +402,7 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { * immutable tree of byte arrays ("chunks") of the stream data. The * first chunk is small, with subsequent chunks each being double * the size, up to 8K. - * + * * <p>Each byte read from the input stream will be copied twice to ensure * that the resulting ByteString is truly immutable. * @@ -1226,7 +1226,7 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { return String.format("<ByteString@%s size=%d>", Integer.toHexString(System.identityHashCode(this)), size()); } - + /** * This class implements a {@link com.google.protobuf.ByteString} backed by a * single array of bytes, contiguous in memory. It supports substring by @@ -1450,7 +1450,7 @@ public abstract class ByteString implements Iterable<Byte>, Serializable { return 0; } } - + /** * This class is used to represent the substring of a {@link ByteString} over a * single byte array. In terms of the public API of {@link ByteString}, you end diff --git a/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java b/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java index 29e8d875..4764ca1b 100644 --- a/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java +++ b/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java @@ -55,7 +55,7 @@ public class LiteEqualsAndHashTest extends TestCase { // correctly when linked only against the lite library. // We do however do some basic testing to make sure that equals is actually - // overriden to test for value equality rather than simple object equality. + // overridden to test for value equality rather than simple object equality. // Check that two identical objs are equal. Foo foo1a = Foo.newBuilder() |