Merge pull request #106 from xfxyjwf/fix_62

Fix javadoc warnings.
pull/109/head
Feng Xiao 10 years ago
commit 209840eca7
  1. 6
      java/src/main/java/com/google/protobuf/ByteString.java
  2. 22
      java/src/main/java/com/google/protobuf/Internal.java

@ -502,9 +502,9 @@ public abstract class ByteString implements Iterable<Byte> {
/**
* Internal (package private) implementation of
* @link{#copyTo(byte[],int,int,int}.
* {@link #copyTo(byte[],int,int,int)}.
* It assumes that all error checking has already been performed and that
* @code{numberToCopy > 0}.
* {@code numberToCopy > 0}.
*/
protected abstract void copyToInternal(byte[] target, int sourceOffset,
int targetOffset, int numberToCopy);
@ -699,7 +699,7 @@ public abstract class ByteString implements Iterable<Byte> {
* The {@link InputStream} returned by this method is guaranteed to be
* completely non-blocking. The method {@link InputStream#available()}
* returns the number of bytes remaining in the stream. The methods
* {@link InputStream#read(byte[]), {@link InputStream#read(byte[],int,int)}
* {@link InputStream#read(byte[])}, {@link InputStream#read(byte[],int,int)}
* and {@link InputStream#skip(long)} will read/skip as many bytes as are
* available.
* <p>

@ -236,7 +236,7 @@ public class Internal {
}
/**
* Helper method for implementing {@link MessageLite#hashCode()} for longs.
* Helper method for implementing {@link Message#hashCode()} for longs.
* @see Long#hashCode()
*/
public static int hashLong(long n) {
@ -244,7 +244,7 @@ public class Internal {
}
/**
* Helper method for implementing {@link MessageLite#hashCode()} for
* Helper method for implementing {@link Message#hashCode()} for
* booleans.
* @see Boolean#hashCode()
*/
@ -253,7 +253,7 @@ public class Internal {
}
/**
* Helper method for implementing {@link MessageLite#hashCode()} for enums.
* Helper method for implementing {@link Message#hashCode()} for enums.
* <p>
* This is needed because {@link java.lang.Enum#hashCode()} is final, but we
* need to use the field number as the hash code to ensure compatibility
@ -264,7 +264,7 @@ public class Internal {
}
/**
* Helper method for implementing {@link MessageLite#hashCode()} for
* Helper method for implementing {@link Message#hashCode()} for
* enum lists.
*/
public static int hashEnumList(List<? extends EnumLite> list) {
@ -276,7 +276,7 @@ public class Internal {
}
/**
* Helper method for implementing {@link MessageLite#equals()} for bytes field.
* Helper method for implementing {@link Message#equals(Object)} for bytes field.
*/
public static boolean equals(List<byte[]> a, List<byte[]> b) {
if (a.size() != b.size()) return false;
@ -289,7 +289,7 @@ public class Internal {
}
/**
* Helper method for implementing {@link MessageLite#hashCode()} for bytes field.
* Helper method for implementing {@link Message#hashCode()} for bytes field.
*/
public static int hashCode(List<byte[]> list) {
int hash = 1;
@ -300,7 +300,7 @@ public class Internal {
}
/**
* Helper method for implementing {@link MessageLite#hashCode()} for bytes field.
* Helper method for implementing {@link Message#hashCode()} for bytes field.
*/
public static int hashCode(byte[] bytes) {
// The hash code for a byte array should be the same as the hash code for a
@ -311,7 +311,7 @@ public class Internal {
}
/**
* Helper method for implementing {@link MessageLite#equals()} for bytes
* Helper method for implementing {@link Message#equals(Object)} for bytes
* field.
*/
public static boolean equalsByteBuffer(ByteBuffer a, ByteBuffer b) {
@ -324,7 +324,7 @@ public class Internal {
}
/**
* Helper method for implementing {@link MessageLite#equals()} for bytes
* Helper method for implementing {@link Message#equals(Object)} for bytes
* field.
*/
public static boolean equalsByteBuffer(
@ -341,7 +341,7 @@ public class Internal {
}
/**
* Helper method for implementing {@link MessageLite#hashCode()} for bytes
* Helper method for implementing {@link Message#hashCode()} for bytes
* field.
*/
public static int hashCodeByteBuffer(List<ByteBuffer> list) {
@ -355,7 +355,7 @@ public class Internal {
private static final int DEFAULT_BUFFER_SIZE = 4096;
/**
* Helper method for implementing {@link MessageLite#hashCode()} for bytes
* Helper method for implementing {@link Message#hashCode()} for bytes
* field.
*/
public static int hashCodeByteBuffer(ByteBuffer bytes) {

Loading…
Cancel
Save